comt: comparison src/cm/views/texts.py

equal deleted inserted replaced

-:dbbd99172620
+:c8a95e540b79
+from cm.utils.embed import embed_html
 from cm.activity import register_activity
 from cm.client import jsonize, get_filter_datas, edit_comment, remove_comment, \
 add_comment, RequestComplexEncoder, comments_thread, own_notify
 from cm.cm_settings import NEW_TEXT_VERSION_ON_EDIT
 from cm.diff import text_diff as _text_diff, text_history as inner_text_history, \
 from cm.utils import get_among, get_among, get_int
 from cm.utils.comment_positioning import compute_new_comment_positions, \
 insert_comment_markers
 from cm.utils.html import cleanup_textarea
 from cm.utils.spannifier import spannify
-from cm.views import get_keys_from_dict, get_text_by_keys_or_404, redirect
+from cm.views import get_keys_from_dict, get_textversion_by_keys_or_404, get_text_by_keys_or_404, redirect
 from cm.views.export import content_export2
 from cm.views.user import AnonUserRoleForm, cm_login
 from difflib import unified_diff
 from django import forms
 from django.conf import settings
 paginate_by = paginate_by,
 )
 @has_perm_on_text('can_view_text')
 def text_view(request, key, adminkey=None):
 text = get_text_by_keys_or_404(key)
 register_activity(request, "text_view", text=text)
 text_version = text.get_latest_version()
-template_dict = { 'text' : text, 'text_version' : text_version, 'title' : text_version.title, 'content' : text_version.get_content()}
+embed_code = embed_html(key, 'id="text_view_frame" name="text_view_frame"')
+template_dict = { 'embed_code':embed_code, 'text' : text, 'text_version' : text_version, 'title' : text_version.title, 'content' : text_version.get_content()}
 return render_to_response('site/text_view.html', template_dict, context_instance=RequestContext(request))
 @has_perm_on_text('can_delete_text')
 def text_delete(request, key):
 text = Text.objects.get(key=key)
 register_activity(request, "text_removed", text=text)
 text.delete()
 return HttpResponse('') # no redirect because this is called by js
 @has_perm_on_text('can_view_text') # only protected by text_view / comment filtering done in view
-def text_view_comments(request, key, adminkey=None):
+def text_view_comments(request, key, version_key=None, adminkey=None):
 text = get_text_by_keys_or_404(key)
-#TODO: stupid why restrict to latest ?
+if version_key :
-text_version = text.get_latest_version()
+text_version = get_textversion_by_keys_or_404(version_key, adminkey, key)
+else :
+text_version = text.get_latest_version()
 comments = get_viewable_comments(request, text_version.comment_set.filter(reply_to__isnull=True),text)
 filter_datas = get_filter_datas(request, text_version, text)
 get_params = simplejson.dumps(request.GET)
 # TODO: (RBE to RBA) send mail withinfos
 ret = "warn test"
 #print request.POST
 elif request.POST:
 key = request.POST['key']
+version_key = request.POST['version_key']
 text = Text.objects.get(key=key) ;
 #TODO: stupid why restrict to latest ?
 text_version = text.get_latest_version()
 ret = own_notify(request=request, key=key)
 if function_name in ('editComment', 'addComment', 'removeComment',) :
 if function_name == 'editComment' :
 ret = edit_comment(request=request, key=key, comment_key=request.POST['comment_key'])
 elif function_name == 'addComment' :
-ret = add_comment(request=request, key=key)
+ret = add_comment(request=request, key=key, version_key=version_key)
 elif function_name == 'removeComment' :
 ret = remove_comment(request=request, key=key, comment_key=request.POST['comment_key'])
 ret['filterData'] = get_filter_datas(request, text_version, text)
 #ret['tagCloud'] = get_tagcloud(key)
 return render_to_response('site/text_print.html',
 template_dict,
 context_instance=RequestContext(request))
 @has_perm_on_text('can_view_text')
-def text_view_frame(request, key, adminkey=None):
+def text_view_frame(request, key, version_key=None, adminkey=None):
 text = get_text_by_keys_or_404(key)
-text_version = text.get_latest_version()
+if version_key :
-template_dict = {'text' : text}
+text_version = get_textversion_by_keys_or_404(version_key, adminkey, key)
+else :
+text_version = text.get_latest_version()
+template_dict = {'text' : text, 'text_version' : text_version}
 return render_to_response('site/text_view_frame.html',
 template_dict,
 context_instance=RequestContext(request))
 vv2 = versions[index + 1]
 else:
 vv2 = None
 paired_versions.append((vv1, vv2, colors_dict.get(vv1.get_name(), '#D9D9D9')))
+embed_code = ""
+content = ""
 if v1_nid and not v2_nid:
-content = v1.get_content()
+embed_code = embed_html(key, 'id="text_view_frame" name="text_view_frame"', v1.key)
 else:
 content = get_uniffied_inner_diff_table(cleanup_textarea(v1.content), cleanup_textarea(v2.content))
 template_dict = {'paired_versions' : paired_versions,
 'text' : text,
 'v1_id' : v1_id,
 'v2_id' : v2_id,
 'version1': v1,
 'version2': v2,
 'content' : content,
+'embed_code':embed_code,
 'author_colors' : author_colors,
 }
 return render_to_response('site/text_history.html', template_dict, context_instance=RequestContext(request))
 # taken from trac
 text_version_2 = TextVersion.objects.get(pk=id_v2)
 content = _text_diff(text_version_1.get_content(), text_version_2.get_content())
 title = _text_diff(text_version_1.title, text_version_2.title)
 return render_to_response('site/text_view.html', {'text' : text, 'text_version_1' : text_version_1, 'text_version_2' : text_version_2, 'title' : title, 'content' : content}, context_instance=RequestContext(request))
+# commented out, unused suspected
-@has_perm_on_text('can_view_text')
+#@has_perm_on_text('can_view_text')
-def text_version(request, key, id_version):
+#def text_version(request, key, id_version):
-text = get_text_by_keys_or_404(key)
+#    text = get_text_by_keys_or_404(key)
-text_version = TextVersion.objects.get(pk=id_version)
+#    text_version = TextVersion.objects.get(pk=id_version)
-# TODO : assert text_v in text ...
+#    # TODO : assert text_v in text ...
-# TODO : do not use db id
+#    # TODO : do not use db id
-return render_to_response('site/text_view.html', {'text' : text, 'text_version' : text_version, 'title' : text_version.title, 'content' : text_version.get_content()}, context_instance=RequestContext(request))
+#    return render_to_response('site/text_view.html', {'text' : text, 'text_version' : text_version, 'title' : text_version.title, 'content' : text_version.get_content()}, context_instance=RequestContext(request))
 class EditTextForm(ModelForm):
 title = forms.CharField(label=_("Title"), widget=forms.TextInput)
 #format = forms.CharField(label=_("Format"))
 #content = forms.TextField(label=_("Content"))

changeset 24	c8a95e540b79
parent 12	f69ff46d3240
child 38	be1807d390d4