--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Jul 22 18:56:30 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Tue Jul 23 13:18:41 2013 +0200
@@ -8,7 +8,6 @@
{% block js_import %}
{{ block.super }}
<script type="text/javascript" src='{% static "ldt/js/jquery.min.js" %}'></script>
- <script type="text/javascript" src='{% static "ldtjs/jquery.qtip.min.js" %}'></script>
<script type="text/javascript" src='{% static "ldt/js/embed_popup.js" %}'></script>
<script type="text/javascript" src='{% static "ldt/js/jscolor/jscolor.js" %}'></script>
{{ content_form.media.js }}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Jul 22 18:56:30 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Tue Jul 23 13:18:41 2013 +0200
@@ -2,6 +2,7 @@
{% load i18n %}
{% load static %}
{% block js_import %}
+{% load absstatic %}
{{block.super}}
<script type="text/javascript" src="{% url 'ldt.jsi18n' packages='ldt' %}" ></script>
<script type="text/javascript" src='{% static "ldt/js/projectscontents.js" %}' ></script>
@@ -51,7 +52,7 @@
init_events(document);
- $(".update_group_projects").live("click", function(){
+ $(".update_group_projects").click(function(){
//alert("group id = " + $(this).attr('id') + ", url = " + get_group_projects_url);
var id_group = $(this).attr('id');
// Remove icons from all the lines
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Mon Jul 22 18:56:30 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Tue Jul 23 13:18:41 2013 +0200
@@ -48,11 +48,9 @@
<td class="cellimg"><div class="cellimgdiv"><img src='{% static "ldt/img/page_copy.png" %}' href="{% url 'ldt.ldt_utils.views.project.copy_project' ldt_id=project.ldt_id group_id=group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
<td class="cellimg">
<div class="cellimgdiv">
- {% if project.state == 2 %}
<a href='{% url 'ldt.ldt_utils.views.workspace.popup_embed' %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
<img src='{% static "ldt/img/plugin.png" %}' id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/>
</a>
- {% endif %}
</div>
</td>
<td class="cellimg">
--- a/src/ldt/ldt/ldt_utils/views/workspace.py Mon Jul 22 18:56:30 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py Tue Jul 23 13:18:41 2013 +0200
@@ -227,7 +227,7 @@
def get_datas_for_embed(request, json_url, player_id, ldt_id):
- project = Project.safe_objects.prefetch_related("contents").get(ldt_id=ldt_id) #@UndefinedVariable
+ project = Project.safe_objects.prefetch_related("contents", "owner").get(ldt_id=ldt_id) #@UndefinedVariable
project_contents = project.contents.all()
content = project_contents[0]
WEB_URL = get_web_url(request)
@@ -244,7 +244,13 @@
stream_mode = 'radio'
if not ldt_auth.check_access(request.user, project):
- return HttpResponseForbidden(_("You can not access this project"))
+ # If the project is unpublished AND if the user is the owner, we display few datas
+ #TODO : enhance rend_dict and display in this case
+ if project.state==1 and project.owner==request.user:
+ pass
+ else:
+ #return HttpResponseForbidden(_("You can not access this project"))
+ return {'ldt_id': ldt_id}
LANGUAGE_CODE = settings.LANGUAGE_CODE
ps = ProjectJsonSerializer(project, from_contents=True, from_display=True)
annotations = ps.get_annotations(first_cutting=True)