src/cm/views/texts.py
author raph
Fri, 16 Apr 2010 10:34:54 +0200
changeset 255 81842341dc5a
parent 250 cae2de810f77
child 274 e49623f99d02
permissions -rw-r--r--
cleanup diff for human reading
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
     1
from cm.utils.embed import embed_html
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     2
from cm.activity import register_activity
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     3
from cm.client import jsonize, get_filter_datas, edit_comment, remove_comment, \
12
f69ff46d3240 various notification changes
reno
parents: 0
diff changeset
     4
    add_comment, RequestComplexEncoder, comments_thread, own_notify
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     5
from cm.cm_settings import NEW_TEXT_VERSION_ON_EDIT
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     6
from cm.exception import UnauthorizedException
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     7
from cm.message import *
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     8
from cm.models import *
70
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
     9
from django.forms.util import ErrorList
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    10
from cm.models_base import generate_key
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    11
from cm.security import get_texts_with_perm, has_perm, get_viewable_comments, \
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    12
    has_perm_on_text
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    13
from cm.utils import get_among, get_among, get_int
175
4f072edc51a1 BUG FIX : handling html
rbernard
parents: 157
diff changeset
    14
from cm.utils.html import on_content_receive
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    15
from cm.utils.comment_positioning import compute_new_comment_positions, \
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    16
    insert_comment_markers
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    17
from cm.utils.spannifier import spannify
250
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
    18
from cm.utils.diff import diff_match_patch2
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
    19
from cm.views import get_keys_from_dict, get_textversion_by_keys_or_404, get_text_by_keys_or_404, redirect
103
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
    20
from cm.views.export import content_export2, content_export
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    21
from cm.views.user import AnonUserRoleForm, cm_login
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    22
from difflib import unified_diff
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    23
from django import forms
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    24
from django.conf import settings
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    25
from django.contrib.auth import login as django_login
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    26
from django.contrib.auth.forms import AuthenticationForm
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    27
from django.contrib.auth.models import User
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    28
from django.core.urlresolvers import reverse
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    29
from django.db.models import Q
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    30
from django.forms import ModelForm
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    31
from django.forms.models import BaseModelFormSet, modelformset_factory
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    32
from django.http import HttpResponse, HttpResponseRedirect, Http404
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    33
from django.shortcuts import render_to_response
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    34
from django.template import RequestContext
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    35
from django.template.loader import render_to_string
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    36
from django.utils.translation import ugettext as _, ugettext_lazy
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    37
from django.views.generic.list_detail import object_list
38
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
    38
from tagging.models import Tag
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    39
import difflib
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    40
import logging
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    41
import mimetypes
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    42
import simplejson
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    43
import sys
231
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
    44
import re
74
c1b6828677db fix bug when no tag is present
raph
parents: 71
diff changeset
    45
from django.db.models.sql.datastructures import EmptyResultSet
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    46
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    47
def get_text_and_admin(key, adminkey, assert_admin = False):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    48
    """
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    49
    assert_admin => redirect to unauthorized if not admin 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    50
    """
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    51
    admin = False
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    52
    if adminkey:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    53
        text = Text.objects.get(key = key, adminkey = adminkey)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    54
        if text:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    55
            admin = True
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    56
    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    57
        text = Text.objects.get(key=key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    58
    if assert_admin and not admin:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    59
        raise UnauthorizedException('Is not admin')        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    60
    return text, admin
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    61
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    62
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    63
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    64
ACTIVITY_PAGINATION = 10
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    65
RECENT_TEXT_NB = 5
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    66
RECENT_COMMENT_NB = RECENT_TEXT_NB
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    67
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    68
MODERATE_NB = 5
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    69
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    70
def dashboard(request):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    71
    request.session.set_test_cookie()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    72
    if request.user.is_authenticated():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    73
        act_view = {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    74
                    'view_texts' : get_int(request.GET,'view_texts',1),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    75
                    'view_comments' : get_int(request.GET,'view_comments',1),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    76
                    'view_users' : get_int(request.GET,'view_users',1),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    77
                    }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    78
            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    79
        paginate_by = get_int(request.GET,'paginate',ACTIVITY_PAGINATION)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    80
                
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    81
        # texts with can_view_unapproved_comment perms
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    82
        moderator_texts = get_texts_with_perm(request, 'can_view_unapproved_comment')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    83
        viewer_texts = get_texts_with_perm(request, 'can_view_approved_comment')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    84
        all_texts_ids = [t.id for t in moderator_texts] + [t.id for t in viewer_texts]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    85
                    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    86
        span = get_among(request.GET,'span',('day','month','week',),'week')        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    87
        template_dict = { 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    88
                         'span' : span,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    89
                         'last_texts' : get_texts_with_perm(request, 'can_view_text').order_by('-modified')[:RECENT_TEXT_NB],
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    90
                         'last_comments' : Comment.objects.filter(text_version__text__in=all_texts_ids).order_by('-created')[:RECENT_COMMENT_NB],# TODO: useful?
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    91
                         #'last_users' : User.objects.all().order_by('-date_joined')[:5],
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    92
                         }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    93
        template_dict.update(act_view)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    94
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    95
        all_activities = {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    96
                               'view_comments' : ['comment_created','comment_removed'],
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    97
                               'view_users' : ['user_created', 'user_activated', 'user_suspended','user_enabled',],
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    98
                               'view_texts' : ['text_created','text_removed', 'text_edited', 'text_edited_new_version'],
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    99
                               }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   100
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   101
        selected_activities = []
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   102
        [selected_activities.extend(all_activities[k]) for k in act_view.keys() if act_view[k]]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   103
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   104
        activities = Activity.objects.filter(type__in = selected_activities)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   105
        if not has_perm(request,'can_manage_workspace'):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   106
            texts = get_texts_with_perm(request, 'can_view_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   107
            activities = activities.filter(Q(text__in=texts))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   108
            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   109
            comments = [] 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   110
            [comments.extend(get_viewable_comments(request, t.last_text_version.comment_set.all(), t)) for t in texts]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   111
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   112
            activities = activities.filter(Q(comment__in=comments) | Q(comment=None) )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   113
            template_dict['to_mod_profiles'] = []
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   114
        else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   115
            template_dict['to_mod_profiles'] = UserProfile.objects.filter(user__is_active=False).filter(is_suspended=True).order_by('-user__date_joined')[:MODERATE_NB]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   116
        template_dict['to_mod_comments'] = Comment.objects.filter(state='pending').filter(text_version__text__in=moderator_texts).order_by('-modified')[:MODERATE_NB-len(template_dict['to_mod_profiles'])]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   117
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   118
        activities = activities.order_by('-created')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   119
        return object_list(request, activities,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   120
                           template_name = 'site/dashboard.html',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   121
                           paginate_by = paginate_by,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   122
                           extra_context = template_dict,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   123
                           )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   124
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   125
    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   126
        if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   127
            form = AuthenticationForm(request, request.POST)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   128
            if form.is_valid():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   129
                user = form.get_user()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   130
                user.backend = 'django.contrib.auth.backends.ModelBackend'
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   131
                cm_login(request, user)            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   132
                display_message(request, _(u"You're logged in!"))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   133
                return HttpResponseRedirect(reverse('index'))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   134
        else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   135
            form = AuthenticationForm()        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   136
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   137
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   138
        public_texts = get_texts_with_perm(request, 'can_view_text').order_by('-modified')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   139
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   140
        template_dict = {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   141
                         'form' : form,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   142
                         'texts' : public_texts,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   143
                         }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   144
        return render_to_response('site/non_authenticated_index.html', template_dict, context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   145
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   146
TEXT_PAGINATION = 10
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   147
# security check inside view
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   148
# TODO: set global access perm
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   149
def text_list(request):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   150
    paginate_by = get_int(request.GET,'paginate',TEXT_PAGINATION)
38
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   151
    tag_selected = request.GET.get('tag_selected', 0)
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   152
        
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   153
    order_by = get_among(request.GET,'order',('title','author','modified','-title','-author','-modified'),'-modified')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   154
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   155
    if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   156
        action = request.POST.get('action',None)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   157
        text_keys = get_keys_from_dict(request.POST, 'check-').keys()        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   158
        if action == 'delete':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   159
            for text_key in text_keys:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   160
                text = Text.objects.get(key=text_key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   161
                if has_perm(request, 'can_delete_text', text=text):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   162
                    text.delete()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   163
                else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   164
                    raise UnauthorizedException('No perm can_delete_text on comment') 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   165
            display_message(request, _(u'%(nb_texts)i text(s) deleted') %{'nb_texts':len(text_keys)})
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   166
            return HttpResponseRedirect(reverse('text'))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   167
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   168
    texts = get_texts_with_perm(request, 'can_view_text').order_by(order_by)
38
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   169
74
c1b6828677db fix bug when no tag is present
raph
parents: 71
diff changeset
   170
    try:
c1b6828677db fix bug when no tag is present
raph
parents: 71
diff changeset
   171
        tag_list = Tag.objects.usage_for_queryset(TextVersion.objects.filter(id__in = [t.last_text_version_id for t in get_texts_with_perm(request, 'can_view_text')]))
c1b6828677db fix bug when no tag is present
raph
parents: 71
diff changeset
   172
    except EmptyResultSet:
c1b6828677db fix bug when no tag is present
raph
parents: 71
diff changeset
   173
        tag_list = []
38
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   174
    context = {    
74
c1b6828677db fix bug when no tag is present
raph
parents: 71
diff changeset
   175
               'tag_list' : tag_list,
38
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   176
               'tag_selected': tag_selected,
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   177
               }
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   178
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   179
    if tag_selected:     
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   180
        tag_ids = Tag.objects.filter(name=tag_selected)
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   181
        if tag_ids:   
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   182
            content_type_id = ContentType.objects.get_for_model(TextVersion).pk
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   183
            # table cm_userprofile is not present if display_suspended_users: fix this 
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   184
            texts = texts.extra(where=['tagging_taggeditem.object_id = cm_text.last_text_version_id', 
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   185
                                       'tagging_taggeditem.content_type_id = %i' %content_type_id,
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   186
                                       'tagging_taggeditem.tag_id = %i' %tag_ids[0].id],
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   187
                                tables=['tagging_taggeditem'],
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   188
                                )
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   189
    
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   190
    return object_list(request, texts,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   191
                       template_name = 'site/text_list.html',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   192
                       paginate_by = paginate_by,
38
be1807d390d4 - add tag support to user
raph
parents: 24
diff changeset
   193
                       extra_context=context,
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   194
                       )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   195
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   196
@has_perm_on_text('can_view_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   197
def text_view(request, key, adminkey=None):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   198
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   199
    register_activity(request, "text_view", text=text)    
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   200
    text_version = text.get_latest_version()
103
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
   201
    embed_code = embed_html(key, 'id="text_view_frame" name="text_view_frame"', None, request.META.get('QUERY_STRING'))
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   202
    template_dict = { 'embed_code':embed_code, 'text' : text, 'text_version' : text_version, 'title' : text_version.title, 'content' : text_version.get_content()}
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   203
    return render_to_response('site/text_view.html', template_dict, context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   204
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   205
@has_perm_on_text('can_delete_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   206
def text_delete(request, key):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   207
    text = Text.objects.get(key=key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   208
    if request.method != 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   209
        raise UnauthorizedException('Unauthorized')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   210
    display_message(request, _(u'Text %(text_title)s deleted') %{'text_title':text.title})
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   211
    register_activity(request, "text_removed", text=text)    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   212
    text.delete()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   213
    return HttpResponse('') # no redirect because this is called by js
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   214
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   215
@has_perm_on_text('can_delete_text')
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   216
def text_version_delete(request, key, text_version_key):
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   217
    text_version = TextVersion.objects.get(key=text_version_key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   218
    text=text_version.text
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   219
    if request.method != 'POST':
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   220
        raise UnauthorizedException('Unauthorized')
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   221
    display_message(request, _(u'Text version %(text_version_title)s deleted') %{'text_version_title':text_version.title})
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   222
    register_activity(request, "text_version_removed", text=text)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   223
    text_version.delete()
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   224
    return HttpResponse('') # no redirect because this is called by js
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   225
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   226
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   227
@has_perm_on_text('can_view_text') # only protected by text_view / comment filtering done in view
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   228
def text_view_comments(request, key, version_key=None, adminkey=None):
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   229
    text = get_text_by_keys_or_404(key)
114
49647a504de8 ENH ticket 20 disable edit in versions tab added ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY to settings.py
rbernard
parents: 106
diff changeset
   230
    
49647a504de8 ENH ticket 20 disable edit in versions tab added ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY to settings.py
rbernard
parents: 106
diff changeset
   231
    read_only = False
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   232
    if version_key :
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   233
        text_version = get_textversion_by_keys_or_404(version_key, adminkey, key)
114
49647a504de8 ENH ticket 20 disable edit in versions tab added ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY to settings.py
rbernard
parents: 106
diff changeset
   234
        if settings.ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY :
49647a504de8 ENH ticket 20 disable edit in versions tab added ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY to settings.py
rbernard
parents: 106
diff changeset
   235
            read_only = (text.last_text_version_id != text_version.id) 
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   236
    else :
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   237
        text_version = text.get_latest_version()
114
49647a504de8 ENH ticket 20 disable edit in versions tab added ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY to settings.py
rbernard
parents: 106
diff changeset
   238
    
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   239
    comments = get_viewable_comments(request, text_version.comment_set.filter(reply_to__isnull=True),text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   240
    filter_datas = get_filter_datas(request, text_version, text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   241
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   242
    get_params = simplejson.dumps(request.GET)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   243
    wrapped_text_version, _ , _ = spannify(text_version.get_content())
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   244
    template_dict = {'text' : text,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   245
                               'text_version' : text_version,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   246
                               'title' : text_version.title, # TODO use it ...
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   247
                               'get_params' : get_params,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   248
                               'json_comments':jsonize(comments, request),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   249
                               'json_filter_datas':jsonize(filter_datas, request),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   250
                               'content' : wrapped_text_version,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   251
                               'client_date_fmt' : settings.CLIENT_DATE_FMT,
114
49647a504de8 ENH ticket 20 disable edit in versions tab added ALLOW_CLIENT_MODIF_ON_LAST_VERSION_ONLY to settings.py
rbernard
parents: 106
diff changeset
   252
                               'read_only' : read_only,
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   253
                               }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   254
    return render_to_response('site/text_view_comments.html',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   255
                              template_dict,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   256
                              context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   257
def client_exchange(request):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   258
    ret = None
106
rbernard
parents: 105
diff changeset
   259
    if request.method == 'POST' :
rbernard
parents: 105
diff changeset
   260
        function_name = request.POST['fun']# function called from client
rbernard
parents: 105
diff changeset
   261
        user = request.user
rbernard
parents: 105
diff changeset
   262
        if function_name == 'experiment' :
rbernard
parents: 105
diff changeset
   263
            ret = experiment()
rbernard
parents: 105
diff changeset
   264
        elif function_name == 'warn' :
rbernard
parents: 105
diff changeset
   265
            # TODO: (RBE to RBA) send mail withinfos
rbernard
parents: 105
diff changeset
   266
            ret = "warn test"
rbernard
parents: 105
diff changeset
   267
            #print request.POST
rbernard
parents: 105
diff changeset
   268
        else :
rbernard
parents: 105
diff changeset
   269
            key = request.POST['key']
rbernard
parents: 105
diff changeset
   270
            version_key = request.POST['version_key']
rbernard
parents: 105
diff changeset
   271
    
rbernard
parents: 105
diff changeset
   272
            text = Text.objects.get(key=key) ;
rbernard
parents: 105
diff changeset
   273
            #TODO: stupid why restrict to latest ? 
rbernard
parents: 105
diff changeset
   274
            text_version = text.get_latest_version()
rbernard
parents: 105
diff changeset
   275
            
rbernard
parents: 105
diff changeset
   276
            if (text != None) :
rbernard
parents: 105
diff changeset
   277
                if function_name == 'ownNotify' : 
rbernard
parents: 105
diff changeset
   278
                    ret = own_notify(request=request, key=key)
rbernard
parents: 105
diff changeset
   279
                if function_name in ('editComment', 'addComment', 'removeComment',) :
rbernard
parents: 105
diff changeset
   280
                    if function_name == 'editComment' :
rbernard
parents: 105
diff changeset
   281
                        ret = edit_comment(request=request, key=key, comment_key=request.POST['comment_key'])
rbernard
parents: 105
diff changeset
   282
                    elif function_name == 'addComment' :
rbernard
parents: 105
diff changeset
   283
                        ret = add_comment(request=request, key=key, version_key=version_key)
rbernard
parents: 105
diff changeset
   284
                    elif function_name == 'removeComment' :
rbernard
parents: 105
diff changeset
   285
                        ret = remove_comment(request=request, key=key, comment_key=request.POST['comment_key'])
rbernard
parents: 105
diff changeset
   286
                        
rbernard
parents: 105
diff changeset
   287
                    ret['filterData'] = get_filter_datas(request, text_version, text)
rbernard
parents: 105
diff changeset
   288
                    #ret['tagCloud'] = get_tagcloud(key)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   289
    if ret :
12
f69ff46d3240 various notification changes
reno
parents: 0
diff changeset
   290
        if type(ret) != HttpResponseRedirect and type(ret) != HttpResponse:
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   291
            ret = HttpResponse(simplejson.dumps(ret, cls=RequestComplexEncoder, request=request))        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   292
    else :
12
f69ff46d3240 various notification changes
reno
parents: 0
diff changeset
   293
        ret = HttpResponse()
f69ff46d3240 various notification changes
reno
parents: 0
diff changeset
   294
        ret.status_code = 403 
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   295
    return ret 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   296
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   297
231
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   298
def from_html_links_to_abs_links(content):
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   299
    """
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   300
    Replaces (html) links to attachs with real file path on server
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   301
    """
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   302
    attach_re = r'/text/(?P<key>\w*)/attach/(?P<attach_key>\w*)/'
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   303
    attach_str = r'/text/%s/attach/%s/'
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   304
    for match in re.findall(attach_re, content):
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   305
        link = attach_str %match
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   306
        attach = Attachment.objects.get(key=match[1], text_version__text__key=match[0])                
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   307
        content = content.replace(link, attach.data.path)
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   308
    return content
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   309
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   310
#NOTE : some arguments like : withcolor = "yes" + format = "markdown" are incompatible
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   311
#http://localhost:8000/text/text_key_1/export/pdf/1/all/1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   312
def text_export(request, key, format, download, whichcomments, withcolor, adminkey=None):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   313
    text, admin = get_text_and_admin(key, adminkey)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   314
    text_version = text.get_latest_version()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   315
    original_content = text_version.content
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   316
    original_format = text_version.format # BD : html or markdown for  now ...
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   317
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   318
    download_response = download == "1"
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   319
    with_color = withcolor == "1"
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   320
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   321
    comments = [] # whichcomments=="none"
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   322
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   323
    if whichcomments == "filtered" or whichcomments == "all":
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   324
        #comments = text_version.comment_set.filter(reply_to__isnull=True)# whichcomments=="all"
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   325
        #comments = get_viewable_comments(request, text_version.comment_set.filter(reply_to__isnull=True), text, order_by=('start_wrapper','start_offset','end_wrapper','end_offset'))# whichcomments=="all"
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   326
        
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   327
        _comments = text_version.comment_set.all()
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   328
        if whichcomments == "filtered" :
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   329
            filteredIds = []
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   330
            if request.method == 'POST' :
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   331
                ll = request.POST.get('filteredIds',[]).split(",")
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   332
                filteredIds = [ int(l) for l in ll if l]
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   333
            _comments = text_version.comment_set.filter(id__in=filteredIds) # security ! TODO CROSS PERMISSIONS WITH POST CONTENT
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   334
            
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   335
        comments = get_viewable_comments(request, _comments, text, order_by=('start_wrapper','start_offset','end_wrapper','end_offset'))# whichcomments=="all"
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   336
        
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   337
    # decide to use pandoc or not
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   338
    if with_color :
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   339
        use_pandoc = False  # pandoc wouldn't preserve comments scope background colors
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   340
    else :
191
c6e4c5a996d0 BUG FIX : fix tex/latex format
rbernard
parents: 180
diff changeset
   341
        if format in ('markdown', 'latex') : 
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   342
            use_pandoc = True
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   343
        elif format in ('pdf', 'odt') : 
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   344
            use_pandoc = (original_format == "markdown")
231
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   345
        elif format in ('doc', 'html') :
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   346
            use_pandoc = False
231
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   347
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   348
    # correct attach path => real path
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   349
    if format in ('pdf','odt') :        
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   350
        original_content = from_html_links_to_abs_links(original_content)
e71ea24ff34c fix image path for pdf & odt exports (fixes #5)
raph
parents: 230
diff changeset
   351
            
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   352
    if len(comments) == 0 : #want to bypass html conversion in this case
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   353
        return content_export2(request, original_content, text_version.title, original_format, format, use_pandoc, download_response)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   354
    else : # case comments to be added  
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   355
        #comments = comments.order_by('start_wrapper','start_offset','end_wrapper','end_offset')
232
a6c6b046a9c0 image path correction (when comments)
raph
parents: 231
diff changeset
   356
        html = pandoc_convert(original_content, original_format, 'html')
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   357
        wrapped_text_version, _ , _ = spannify(html)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   358
        with_markers = True
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   359
        marked_content = insert_comment_markers(wrapped_text_version, comments, with_markers, with_color)
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   360
    
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   361
        viewable_comments = comments_thread(request, text_version, text) 
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   362
    #        viewable_commentsnoreply = get_viewable_comments(request, commentsnoreply, text, order_by = ('start_wrapper','start_offset','end_wrapper','end_offset'))
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   363
    #        viewable_comments = []
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   364
    #        for cc in viewable_commentsnoreply :
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   365
    #            viewable_comments += list_viewable_comments(request, [cc], text)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   366
            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   367
        # numerotation{  id --> numbered as a child}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   368
        extended_comments = {}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   369
        nb_children = {}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   370
        for cc in viewable_comments :
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   371
            id = 0 #<-- all top comments are children of comment with id 0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   372
            if cc.is_reply() :
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   373
                id = cc.reply_to_id
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   374
                
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   375
            nb_children[id] = nb_children.get(id, 0) + 1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   376
            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   377
            cc.num = "%d"%nb_children[id]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   378
            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   379
            extended_comments[cc.id] = cc
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   380
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   381
            if cc.is_reply() :
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   382
                cc.num = "%s.%s"%(extended_comments[cc.reply_to_id].num, cc.num)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   383
        
56
bd8a4ffc7dad BUG FIX : pdf export PhA tests, TODO fix special html caracters in comments
reno
parents: 42
diff changeset
   384
    #        viewable_comments += list_viewable_comments(request, viewable_commentsnoreply, text)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   385
        html_comments=render_to_string('site/macros/text_comments.html',{'comments':viewable_comments }, context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   386
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   387
        content = "%s%s"%(marked_content, html_comments)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   388
        content_format = "html" 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   389
        # impossible to satisfy because of color then no colors instead:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   390
        if with_color and format in ('markdown', 'tex') : #TODO : add S5
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   391
            with_color = False  
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   392
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   393
        return content_export2(request, content, text_version.title, content_format, format, use_pandoc, download_response)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   394
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   395
def text_print(request, key, adminkey=None):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   396
    text, admin = get_text_and_admin(key, adminkey)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   397
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   398
    text_version = text.get_latest_version()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   399
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   400
#    chosen default url behaviour is export all comments + bckcolor + pdf  
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   401
    comments = Comment.objects.filter(text_version=text_version, reply_to__isnull=True)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   402
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   403
    with_markers = True
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   404
    with_colors = True 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   405
    download_requested = True   
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   406
    action = 'export' # client origine dialog
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   407
    requested_format = 'pdf' # requested output format
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   408
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   409
    if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   410
        # colors or not ?
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   411
        with_colors = (u'yes' == request.POST.get('p_color', u'no'))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   412
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   413
        # restrict comments to ones that should be exported / printed          
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   414
        p_comments = request.POST.get('p_comments')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   415
        if p_comments == "filtered" or p_comments == "none" : 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   416
            filteredIds = [] # "none" case  
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   417
            if p_comments == "filtered" : 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   418
                ll = request.POST.get('filteredIds').split(",")
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   419
                filteredIds = [ int(l) for l in ll if l]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   420
  
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   421
            comments = comments.filter(id__in=filteredIds)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   422
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   423
        # print or export ?
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   424
        action = request.POST.get('print_export_action')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   425
        requested_format = request.POST.get('p_method')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   426
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   427
    comments = comments.order_by('start_wrapper','start_offset','end_wrapper','end_offset')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   428
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   429
    download_requested = (action == 'export') or (action == 'print' and requested_format != 'html')   
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   430
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   431
    ori_format = text_version.format # BD : html or markdown for  now ...
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   432
    src_format = ori_format # as expected by convert functions ...
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   433
    src = text_version.content
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   434
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   435
    if len(comments) > 0 and (with_markers or with_colors) :
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   436
        html = text_version.get_content()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   437
        wrapped_text_version, _ , _ = spannify(html)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   438
        marked_text_version = insert_comment_markers(wrapped_text_version, comments, with_markers, with_colors)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   439
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   440
        src_format = 'html'
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   441
        src = marked_text_version
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   442
        html_comments=render_to_string('site/macros/text_comments.html',{'comments':comments}, context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   443
        src += html_comments
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   444
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   445
    if download_requested :
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   446
        use_pandoc = (requested_format == 'html' or requested_format == 'markdown')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   447
        return content_export(request, src, text_version.title, src_format, requested_format, use_pandoc)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   448
    else : # action == 'print' and requested_format == 'html' (no colors)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   449
        template_dict = {'text' : text,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   450
                       'text_version' : text_version,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   451
                       'title' : text_version.title, # TODO use it ...
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   452
                       'comments': comments,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   453
                       'content' : marked_text_version,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   454
                       'client_date_fmt' : settings.CLIENT_DATE_FMT
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   455
                       }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   456
        if admin:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   457
             template_dict['adminkey'] = text.adminkey   
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   458
             template_dict['admin'] = True       
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   459
        return render_to_response('site/text_print.html',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   460
                                  template_dict,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   461
                                  context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   462
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   463
@has_perm_on_text('can_view_text')
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   464
def text_view_frame(request, key, version_key=None, adminkey=None):
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   465
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   466
    
24
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   467
    if version_key :
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   468
        text_version = get_textversion_by_keys_or_404(version_key, adminkey, key)
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   469
    else :
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   470
        text_version = text.get_latest_version()
c8a95e540b79 ENH : adding comments on previous version now possible
reno
parents: 12
diff changeset
   471
    template_dict = {'text' : text, 'text_version' : text_version}
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   472
    return render_to_response('site/text_view_frame.html',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   473
                              template_dict,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   474
                              context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   475
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   476
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   477
@has_perm_on_text('can_view_text')
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   478
def text_history_version(request, key, version_key):
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   479
    text = get_text_by_keys_or_404(key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   480
    text_version = get_textversion_by_keys_or_404(version_key, key=key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   481
    template_dict = {'text' : text,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   482
                     'text_version' : text_version,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   483
                     'embed_code' : embed_html(key, 'id="text_view_frame" name="text_view_frame"', version_key),
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   484
                      }
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   485
    return render_to_response('site/text_history_version.html',
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   486
                              template_dict,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   487
                              context_instance=RequestContext(request))
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   488
151
150cb6e76f30 add permission check on text compare
raph
parents: 149
diff changeset
   489
@has_perm_on_text('can_view_text')
149
0f2c5744b39b cleanup diff files / add experimental diff
raph
parents: 145
diff changeset
   490
def text_history_compare(request, key, v1_version_key, v2_version_key, mode=''):
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   491
    text = get_text_by_keys_or_404(key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   492
    v1 = get_textversion_by_keys_or_404(v1_version_key, key=key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   493
    v2 = get_textversion_by_keys_or_404(v2_version_key, key=key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   494
178
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   495
    content = get_uniffied_inner_diff_table(v1.title,
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   496
                                            v2.title, 
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   497
                                            _("by %(author)s") %{'author' : v1.get_name()},
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   498
                                            _("by %(author)s") %{'author' : v2.get_name()},
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   499
                                            v1.content,
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   500
                                            v2.content)
149
0f2c5744b39b cleanup diff files / add experimental diff
raph
parents: 145
diff changeset
   501
    if mode=='1':
0f2c5744b39b cleanup diff files / add experimental diff
raph
parents: 145
diff changeset
   502
        # alternate diff
250
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   503
        #from cm.utils.diff import text_diff
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   504
        dif = diff_match_patch2()
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   505
        content = dif.diff_prettyHtml_one_way(dif.diff_main(v1.get_content(), v2.get_content()), mode='ins_del')
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   506
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   507
    template_dict = {
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   508
                     'text' : text,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   509
                     'v1': v1,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   510
                     'v2': v2,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   511
                     'content' : content.strip(),
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   512
                     'empty' : '<table class="diff"><tbody></tbody></table>'==content,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   513
                     }
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   514
    return render_to_response('site/text_history_compare.html',
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   515
                              template_dict,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   516
                              context_instance=RequestContext(request))
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   517
    
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   518
@has_perm_on_text('can_view_text')
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   519
def text_history(request, key):
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   520
    text = get_text_by_keys_or_404(key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   521
    
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   522
    if request.method == 'POST':
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   523
        v1_key = request.POST.get('newkey',None)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   524
        v2_key = request.POST.get('oldkey',None)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   525
        if v1_key and v2_key:  
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   526
            return redirect(request, 'text-history-compare', args=[text.key, v2_key, v1_key ])
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   527
        
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   528
    text_versions = text.get_versions()
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   529
    paginate_by = get_int(request.GET,'paginate',TEXT_PAGINATION)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   530
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   531
    last_last_version = text_versions[1] if len(text_versions)>1 else None 
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   532
    context = {'text':text, 'last_version':text.last_text_version, 'last_last_version':last_last_version}
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   533
    return object_list(request, text_versions,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   534
                       template_name = 'site/text_history.html',
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   535
                       paginate_by = paginate_by,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   536
                       extra_context=context,
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   537
                       )
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   538
    
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   539
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   540
# taken from trac
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   541
def _get_change_extent(str1, str2):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   542
    """
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   543
    Determines the extent of differences between two strings. Returns a tuple
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   544
    containing the offset at which the changes start, and the negative offset
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   545
    at which the changes end. If the two strings have neither a common prefix
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   546
    nor a common suffix, (0, 0) is returned.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   547
    """
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   548
    start = 0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   549
    limit = min(len(str1), len(str2))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   550
    while start < limit and str1[start] == str2[start]:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   551
        start += 1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   552
    end = -1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   553
    limit = limit - start
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   554
    while - end <= limit and str1[end] == str2[end]:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   555
        end -= 1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   556
    return (start, end + 1)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   557
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   558
def diff_decorate(minus, plus):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   559
    return minus, plus
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   560
178
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   561
def get_uniffied_inner_diff_table(title1, title2, author1, author2, text1, text2):
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   562
    """
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   563
    Return the inner of the html table for text1 vs text2 diff
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   564
    """
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   565
    gen = unified_diff(text1.split('\n'), text2.split('\n'), n=3)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   566
    index = 0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   567
    res = ['<table class="diff"><tbody>']
178
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   568
    res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2))
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   569
    res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2))
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   570
    res.append('<tr><td colspan="5"></td></tr>')
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   571
    #res.append('<tr><td width="50%" colspan="2"></td><td width="50%" colspan="2"></td></tr>')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   572
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   573
    for g in gen:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   574
        if index > 1:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   575
            col_in = None
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   576
            if g.startswith('@@'):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   577
                line_number = g.split(' ')[1][1:].split(',')[0]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   578
                if index != 2:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   579
                    res.append('<tr><td></td>&nbsp;<td></td><td></td><td>&nbsp;</td></tr>')                    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   580
                res.append('<tr><td class="diff-lineno" colspan="2">Line %s</td><td class="diff-separator"></td><td class="diff-lineno" colspan="2">Line %s</td></tr>' % (line_number, line_number))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   581
            if g.startswith(' '):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   582
                res.append('<tr><td class="diff-marker"></td><td class="diff-context">%s</td><td class="diff-separator"></td><td class="diff-marker"></td><td class="diff-context">%s</td></tr>' % (g, g))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   583
            if g.startswith('-') or g.startswith('+'):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   584
                plus = []
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   585
                minus = []
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   586
                while g.startswith('-') or g.startswith('+'):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   587
                    if g.startswith('-'):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   588
                        minus.append(g[1:])
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   589
                    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   590
                        plus.append(g[1:])
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   591
                    try:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   592
                        g = gen.next()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   593
                    except StopIteration:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   594
                        break
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   595
                minus, plus = diff_decorate(minus, plus)
250
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   596
                
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   597
                
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   598
                minus, plus = '<br />'.join(minus), '<br />'.join(plus)                
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   599
                dif = diff_match_patch2()
255
81842341dc5a cleanup diff for human reading
raph
parents: 250
diff changeset
   600
                res_diff1 = dif.diff_main(minus, plus)
81842341dc5a cleanup diff for human reading
raph
parents: 250
diff changeset
   601
                dif.diff_cleanupSemantic(res_diff1)
81842341dc5a cleanup diff for human reading
raph
parents: 250
diff changeset
   602
                p = dif.diff_prettyHtml_one_way(res_diff1, 1)
81842341dc5a cleanup diff for human reading
raph
parents: 250
diff changeset
   603
                minus = dif.diff_prettyHtml_one_way(res_diff1, 2)
250
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   604
                plus = p
cae2de810f77 improve diff between versions (word diff)
raph
parents: 240
diff changeset
   605
                res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline">%s</td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline">%s</td></tr>' % (minus, plus))
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   606
             
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   607
        index += 1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   608
    res.append('</tbody></table>')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   609
    return ''.join(res)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   610
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   611
#def text_history_version(request, key):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   612
#    text = get_text_by_keys_or_404(key=key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   613
#    return _text_history_version(request, text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   614
#
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   615
#def text_history_version_admin(request, key, adminkey):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   616
#    text = get_text_by_keys_or_404(key=key, adminkey=adminkey)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   617
#    return _text_history_version(request, text, True)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   618
#    if admin:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   619
#         template_dict['adminkey'] = text.adminkey
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   620
#         template_dict['admin'] = True          
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   621
#    return render_to_response('site/text_history.html', template_dict, context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   622
#
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   623
class TextVersionForm(ModelForm):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   624
    class Meta:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   625
        model = TextVersion
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   626
        fields = ('title', 'content', 'format')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   627
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   628
class EditTextForm(ModelForm):
234
b33dd64a57f0 use lazy i18n for edit form
raph
parents: 232
diff changeset
   629
    title = forms.CharField(label=ugettext_lazy("Title"), widget=forms.TextInput)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   630
    #format = forms.CharField(label=_("Format"))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   631
    #content = forms.TextField(label=_("Content"))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   632
234
b33dd64a57f0 use lazy i18n for edit form
raph
parents: 232
diff changeset
   633
    note = forms.CharField(label=ugettext_lazy("Note (optional)"),
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   634
                           widget=forms.TextInput,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   635
                           required=False,
234
b33dd64a57f0 use lazy i18n for edit form
raph
parents: 232
diff changeset
   636
                           help_text=ugettext_lazy("Add a note to explain the modifications made to the text")
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   637
                           )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   638
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   639
    #tags = forms.CharField(label=_("Tags (optional)"),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   640
    #                       widget=forms.TextInput,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   641
    #                       required=False,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   642
    #                       #help_text=_("Add a note to explain the modifications made to the text")
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   643
    #                       )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   644
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   645
234
b33dd64a57f0 use lazy i18n for edit form
raph
parents: 232
diff changeset
   646
    new_version = forms.BooleanField(label=ugettext_lazy("New version (optional)"),
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   647
                           required=False,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   648
                           initial=True,
234
b33dd64a57f0 use lazy i18n for edit form
raph
parents: 232
diff changeset
   649
                           help_text=ugettext_lazy("Create a new version of this text (recommended)")
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   650
                           )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   651
235
b23aee4dd81d use lazy i18n for edit form
raph
parents: 234
diff changeset
   652
    keep_comments = forms.BooleanField(label=ugettext_lazy("Keep comments (optional)"),
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   653
                           required=False,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   654
                           initial=True,
234
b33dd64a57f0 use lazy i18n for edit form
raph
parents: 232
diff changeset
   655
                           help_text=ugettext_lazy("Keep comments (if not affected by the edit)")
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   656
                           )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   657
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   658
    class Meta:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   659
        model = TextVersion
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   660
        fields = ('title', 'format', 'content', 'new_version', 'tags', 'note')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   661
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   662
    def save_into_text(self, text, request):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   663
        new_content = request.POST.get('content')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   664
        new_title = request.POST.get('title')
71
a865a5d0809a format in text edit not required / add default to old value
raph
parents: 70
diff changeset
   665
        new_format = request.POST.get('format', text.last_text_version.format)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   666
        new_note = request.POST.get('note',None)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   667
        new_tags = request.POST.get('tags',None)
103
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
   668
        cancel_modified_scopes = (request.POST.get('cancel_modified_scopes',u'1') == u'1')
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   669
        version = text.get_latest_version()
103
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
   670
        version.edit(new_title, new_format, new_content, new_tags, new_note, True, cancel_modified_scopes)
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
   671
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   672
        return version
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   673
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   674
    def save_new_version(self, text, request):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   675
        new_content = request.POST.get('content')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   676
        new_title = request.POST.get('title')
71
a865a5d0809a format in text edit not required / add default to old value
raph
parents: 70
diff changeset
   677
        new_format = request.POST.get('format', text.last_text_version.format)        
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   678
        new_note = request.POST.get('note',None)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   679
        new_tags = request.POST.get('tags',None)
103
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
   680
        cancel_modified_scopes = (request.POST.get('cancel_modified_scopes',u'1') == u'1')
178
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   681
        
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   682
        new_text_version = text.edit(new_title, new_format, new_content, new_tags, new_note, keep_comments=True, cancel_modified_scopes=cancel_modified_scopes, new_version=True)
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   683
        
103
61fd17f9ab78 enh: detached comments
rbernard
parents: 74
diff changeset
   684
        new_text_version.edit(new_title, new_format, new_content, new_tags, new_note, True, cancel_modified_scopes)
178
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   685
        new_text_version.user = request.user if request.user.is_authenticated() else None
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   686
        new_text_version.note = request.POST.get('note','')
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   687
        new_text_version.email = request.POST.get('email','')
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   688
        new_text_version.name = request.POST.get('name','')
bfb36a5d5e50 redesign compare page
raph
parents: 157
diff changeset
   689
        new_text_version.save()
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   690
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   691
        return new_text_version
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   692
70
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   693
    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   694
                 initial=None, error_class=ErrorList, label_suffix=':',
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   695
                 empty_permitted=False, instance=None):
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   696
        ModelForm.__init__(self, data, files, auto_id, prefix, initial, error_class, label_suffix, empty_permitted, instance)
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   697
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   698
        # override manually to disabled
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   699
        format_field = self.fields['format']
237
48c4d74c5cd9 help update / i18n
raph
parents: 235
diff changeset
   700
        format_field.widget.attrs = {'disabled':'disabled'}
71
a865a5d0809a format in text edit not required / add default to old value
raph
parents: 70
diff changeset
   701
        format_field.required = False
70
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   702
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   703
        self.fields['format'] = format_field
11b691c88348 make format read-only (comment positioning problem)
raph
parents: 62
diff changeset
   704
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   705
@has_perm_on_text('can_edit_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   706
def text_pre_edit(request, key, adminkey=None):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   707
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   708
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   709
    text_version = text.get_latest_version()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   710
    comments = text_version.get_comments() ;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   711
    new_format = request.POST['new_format']
175
4f072edc51a1 BUG FIX : handling html
rbernard
parents: 157
diff changeset
   712
    new_content = on_content_receive(request.POST['new_content'], new_format)
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   713
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   714
    # TODO: RBE : si commentaire mal forme : (position non existante : boom par key error)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   715
    _tomodify_comments, toremove_comments = compute_new_comment_positions(text_version.content, text_version.format, new_content, new_format, comments)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   716
    return HttpResponse(simplejson.dumps({'nb_removed' : len(toremove_comments) }))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   717
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   718
class EditTextFormAnon(EditTextForm):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   719
    name = forms.CharField(label=ugettext_lazy("Name (optional)"), widget=forms.TextInput, required=False)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   720
    email = forms.EmailField(label=ugettext_lazy("Email (optional)"), required=False)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   721
    content = forms.CharField(label=ugettext_lazy("Content"), required=True, widget=forms.Textarea(attrs={'rows':'30', 'cols': '70'}))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   722
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   723
    class Meta:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   724
        model = TextVersion
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   725
        fields = ('title', 'format', 'content', 'tags', 'note', 'name', 'email')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   726
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   727
@has_perm_on_text('can_edit_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   728
def text_edit(request, key, adminkey=None):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   729
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   730
    text_version = text.get_latest_version()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   731
    if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   732
        if request.user.is_authenticated():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   733
            form = EditTextForm(request.POST)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   734
        else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   735
            form = EditTextFormAnon(request.POST)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   736
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   737
        if form.is_valid():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   738
            if request.POST.get('new_version'):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   739
                new_version = form.save_new_version(text, request)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   740
                register_activity(request, "text_edited_new_version", text=text, text_version=new_version)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   741
            else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   742
                form.save_into_text(text, request)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   743
                register_activity(request, "text_edited", text=text)    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   744
            return redirect(request, 'text-view', args=[text.key]) 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   745
    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   746
        default_data = {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   747
                        'content': text_version.content,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   748
                        'title': text_version.title,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   749
                        'format': text_version.format,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   750
                        'tags': text_version.tags,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   751
                        'new_version': NEW_TEXT_VERSION_ON_EDIT,
240
a00efaf32ea7 note should not beeing passed to new version (fixes #12)
raph
parents: 237
diff changeset
   752
                        'note' : '',
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   753
                        'keep_comments' : True,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   754
                       }        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   755
        if request.user.is_authenticated():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   756
            form = EditTextForm(default_data)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   757
        else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   758
            form = EditTextFormAnon(default_data)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   759
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   760
    template_dict = {'text' : text, 'form' : form}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   761
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   762
    return render_to_response('site/text_edit.html', template_dict , context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   763
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   764
@has_perm_on_text('can_edit_text')
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   765
def text_revert(request, key, text_version_key):
230
fb1a2dfb473d refactor arg passing between frames
raph
parents: 191
diff changeset
   766
    if request.method != 'POST':
fb1a2dfb473d refactor arg passing between frames
raph
parents: 191
diff changeset
   767
        raise UnauthorizedException('Unauthorized')
fb1a2dfb473d refactor arg passing between frames
raph
parents: 191
diff changeset
   768
        
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   769
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   770
145
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   771
    text_version = text.revert_to_version(text_version_key)
fb5b1e6ad179 refactor version explorer
raph
parents: 114
diff changeset
   772
    display_message(request, _(u'A new version (copied from version %(version_title)s) has been created') % {'version_title':text_version.title})
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   773
230
fb1a2dfb473d refactor arg passing between frames
raph
parents: 191
diff changeset
   774
    return HttpResponse('') # no redirect because this is called by js
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   775
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   776
@has_perm_on_text('can_view_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   777
def text_attach(request, key, attach_key):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   778
    attach = Attachment.objects.get(key=attach_key, text_version__text__key=key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   779
    content = file(attach.data.path).read()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   780
    mimetype, _encoding = mimetypes.guess_type(attach.data.path)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   781
    response = HttpResponse(content, mimetype)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   782
    return response
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   783
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   784
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   785
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   786
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   787
def fix_anon_in_formset(formset):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   788
    # fix role choice in formset for anon (not all role are allowed)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   789
    role_field = [f.fields['role'] for f in formset.forms if f.instance.user == None][0]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   790
    role_field.choices = [(u'', u'---------')] + [(r.id, str(r)) for r in Role.objects.filter(anon = True)] # limit anon choices
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   791
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   792
class BaseUserRoleFormSet(BaseModelFormSet):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   793
    def clean(self):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   794
        """Checks that anon users are given roles with anon=True."""
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   795
        for i in range(0, self.total_form_count()):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   796
            form = self.forms[i]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   797
            print form.cleaned_data
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   798
            user_role = form.cleaned_data['id']
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   799
            if user_role.user == None:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   800
                role = form.cleaned_data['role']
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   801
                if not role.anon:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   802
                    # nasty stuff: cannot happen so not dealt with in tempate
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   803
                    logging.warn('Cannot give such role to anon user.')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   804
                    raise forms.ValidationError, "Cannot give such role to anon user."
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   805
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   806
#@has_perm_on_text('can_manage_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   807
#def xtext_share(request, key):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   808
#    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   809
#    order_by = get_among(request.GET,'order',('user__username','-user__username','role__name','-role__name'),'user__username')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   810
#        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   811
#    UserRole.objects.create_userroles_text(text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   812
#    UserRoleFormSet = modelformset_factory(UserRole, fields=('role', ), extra=0, formset = BaseUserRoleFormSet)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   813
#    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   814
#    # put anon users on top no matter what the order says (TODO: ?)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   815
#    userrole_queryset = UserRole.objects.filter(text=text).extra(select={'anon':'"cm_userrole"."user_id">-1'}).order_by('-anon',order_by)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   816
#    if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   817
#        formset = UserRoleFormSet(request.POST, queryset = userrole_queryset)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   818
#
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   819
#        if formset.is_valid():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   820
#            formset.save()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   821
#            display_message(request, "Sharing updated.")
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   822
#            return HttpResponseRedirect(reverse('text-share',args=[text.key]))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   823
#
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   824
#    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   825
#        formset = UserRoleFormSet(queryset = userrole_queryset)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   826
#        fix_anon_in_formset(formset)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   827
#         
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   828
#    global_anon_userrole = UserRole.objects.get(text=None, user=None)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   829
#    return render_to_response('site/text_share.html', {'text' : text, 
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   830
#                                                       'formset' : formset,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   831
#                                                       'global_anon_userrole' : global_anon_userrole,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   832
#                                                       } , context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   833
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   834
# TODO: permission protection ? format value check ?
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   835
def text_wysiwyg_preview(request, format):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   836
    html_content = ""
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   837
    if request.POST : # if satisfied in the no html case, in html case : no POST (cf. markitup) previewTemplatePath and previewParserPath
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   838
        html_content = pandoc_convert(request.POST['data'], format, "html", full=False)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   839
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   840
    return render_to_response('site/wysiwyg_preview.html', {'content':html_content} , context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   841
        #return HttpResponse(pandoc_convert(content, format, "html", full=False))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   842
97
c01cc15e6968 fix pagination in text user list
raph
parents: 74
diff changeset
   843
USER_PAGINATION = 10
c01cc15e6968 fix pagination in text user list
raph
parents: 74
diff changeset
   844
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   845
@has_perm_on_text('can_manage_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   846
def text_share(request, key):
42
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   847
    display_suspended_users = get_int(request.GET, 'display', 0)
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   848
    tag_selected = request.GET.get('tag_selected', 0)
97
c01cc15e6968 fix pagination in text user list
raph
parents: 74
diff changeset
   849
    paginate_by = get_int(request.GET, 'paginate', USER_PAGINATION)    
42
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   850
    
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   851
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   852
    order_by = get_among(request.GET,'order',('user__username',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   853
                                              'user__email',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   854
                                              '-user__username',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   855
                                              '-user__email',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   856
                                              'role__name',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   857
                                              '-role__name',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   858
                                              ),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   859
                          'user__username')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   860
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   861
    UserRole.objects.create_userroles_text(text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   862
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   863
    if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   864
        if 'save' in request.POST:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   865
            user_profile_keys_roles = get_keys_from_dict(request.POST, 'user-role-')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   866
            count = 0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   867
            for user_profile_key in user_profile_keys_roles:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   868
                role_id = user_profile_keys_roles[user_profile_key]
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   869
                if not user_profile_key:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   870
                    user_role = UserRole.objects.get(user = None, text = text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   871
                else:                    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   872
                    user_role = UserRole.objects.get(user__userprofile__key = user_profile_key, text = text)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   873
                if (role_id != u'' or user_role.role_id!=None) and role_id!=unicode(user_role.role_id):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   874
                    if role_id:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   875
                        user_role.role_id = int(role_id)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   876
                    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   877
                        user_role.role_id = None
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   878
                    user_role.save()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   879
                    count += 1
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   880
            display_message(request, _(u'%(count)i user(s) role modified') %{'count':count})                
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   881
            return HttpResponseRedirect(reverse('text-share', args=[text.key]))    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   882
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   883
    anon_role = UserRole.objects.get(user = None, text = text).role
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   884
    global_anon_role = UserRole.objects.get(user = None, text = None).role
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   885
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   886
    context = {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   887
               'anon_role' : anon_role,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   888
               'global_anon_role' : global_anon_role,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   889
               'all_roles' : Role.objects.all(),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   890
               'anon_roles' : Role.objects.filter(anon = True),
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   891
               'text' : text,
42
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   892
               'display_suspended_users' : display_suspended_users,
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   893
               'tag_list' : Tag.objects.usage_for_model(UserProfile),
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   894
               'tag_selected': tag_selected,               
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   895
               }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   896
42
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   897
    query = UserRole.objects.filter(text=text).filter(~Q(user=None)).order_by(order_by)
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   898
    if not display_suspended_users:
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   899
        query = query.exclude(Q(user__userprofile__is_suspended=True) & Q(user__is_active=True))
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   900
    else:
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   901
        # trick to include userprofile table anyway (to filter by tags)
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   902
        query = query.filter(Q(user__userprofile__is_suspended=True) | Q(user__userprofile__is_suspended=False))
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   903
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   904
    if tag_selected:     
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   905
        tag_ids = Tag.objects.filter(name=tag_selected)
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   906
        if tag_ids:   
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   907
            content_type_id = ContentType.objects.get_for_model(UserProfile).pk
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   908
            query = query.extra(where=['tagging_taggeditem.object_id = cm_userprofile.id', 
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   909
                                       'tagging_taggeditem.content_type_id = %i' %content_type_id,
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   910
                                       'tagging_taggeditem.tag_id = %i' %tag_ids[0].id],
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   911
                                tables=['tagging_taggeditem'],
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   912
                                )
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   913
82f6e2879e0a add tag filter to text share page
raph
parents: 38
diff changeset
   914
    return object_list(request, query,
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   915
                       template_name = 'site/text_share.html',
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   916
                       paginate_by = paginate_by,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   917
                       extra_context = context,
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   918
                       )
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   919
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   920
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   921
class SettingsTextForm(ModelForm):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   922
    # example name = forms.CharField(label=_("Name (optional)"), widget=forms.TextInput, required=False)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   923
    
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   924
    class Meta:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   925
        model = TextVersion
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   926
        fields = ('mod_posteriori',)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   927
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   928
@has_perm_on_text('can_manage_text')
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   929
def text_settings(request, key):
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   930
    text = get_text_by_keys_or_404(key)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   931
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   932
    text_version = text.get_latest_version()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   933
    if request.method == 'POST':
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   934
        form = SettingsTextForm(request.POST, instance = text_version)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   935
        
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   936
        if form.is_valid():
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   937
            form.save()
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   938
            display_message(request, _(u'Text settings updated'))                            
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   939
            return redirect(request, 'text-view', args=[text.key])
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   940
    else:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   941
        form = SettingsTextForm(instance = text_version)
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   942
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   943
    template_dict = {'text' : text, 'form' : form}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   944
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   945
    return render_to_response('site/text_settings.html', template_dict , context_instance=RequestContext(request))
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
   946