src/cm/views/create.py
changeset 216 6f635c8e98c3
parent 175 4f072edc51a1
child 460 2fdb7d095d5c
equal deleted inserted replaced
215:5a317bdca546 216:6f635c8e98c3
    50         model = TextVersion
    50         model = TextVersion
    51         fields = ('title', 'format', 'content','tags') #, 'note'
    51         fields = ('title', 'format', 'content','tags') #, 'note'
    52 
    52 
    53 @has_global_perm('can_create_text')
    53 @has_global_perm('can_create_text')
    54 def text_create_content(request):
    54 def text_create_content(request):
    55     return _text_create_content(request, CreateTextContentForm)
    55     text, rep = _text_create_content(request, CreateTextContentForm)
       
    56     return rep
    56     
    57     
    57 def redirect_post_create(text) :
    58 def redirect_post_create(text) :
    58     return HttpResponseRedirect(reverse('text-view', args=[text.key]))
    59     return HttpResponseRedirect(reverse('text-view', args=[text.key]))
    59 
    60 
    60 def _text_create_content(request, createForm):
    61 def _text_create_content(request, createForm):
    66         if form.is_valid():
    67         if form.is_valid():
    67                 text = create_text(request.user, form.cleaned_data)
    68                 text = create_text(request.user, form.cleaned_data)
    68                 
    69                 
    69                 register_activity(request, "text_created", text)
    70                 register_activity(request, "text_created", text)
    70                 display_message(request, _(u'Text "%(text_title)s" has been created') %{"text_title":text.get_latest_version().title})
    71                 display_message(request, _(u'Text "%(text_title)s" has been created') %{"text_title":text.get_latest_version().title})
    71                 return redirect_post_create(text)
    72                 return text, redirect_post_create(text)
    72     else:
    73     else:
    73         form = createForm()
    74         form = createForm()
    74         
    75         
    75     return render_to_response('site/text_create_content.html', {'document':document, 'form' : form}, context_instance=RequestContext(request))
    76     return None, render_to_response('site/text_create_content.html', {'document':document, 'form' : form}, context_instance=RequestContext(request))
    76 
    77 
    77 def _text_create_upload(request, createForm):
    78 def _text_create_upload(request, createForm):
    78     
    79     
    79 #    CreateForm = CreateTextUploadForm if request.user.is_authenticated() else CreateTextUploadFormAnon
    80 #    CreateForm = CreateTextUploadForm if request.user.is_authenticated() else CreateTextUploadFormAnon
    80 
    81 
   103             text = create_text(request.user, form.cleaned_data)
   104             text = create_text(request.user, form.cleaned_data)
   104             
   105             
   105             register_activity(request, "text_created", text)
   106             register_activity(request, "text_created", text)
   106             
   107             
   107             display_message(request, _(u'Text "%(text_title)s" has been created')%{"text_title":text.get_latest_version().title})
   108             display_message(request, _(u'Text "%(text_title)s" has been created')%{"text_title":text.get_latest_version().title})
   108             return redirect_post_create(text)
   109             return text, redirect_post_create(text)
   109 
   110 
   110     else:
   111     else:
   111         form = createForm()
   112         form = createForm()
   112         
   113         
   113     return render_to_response('site/text_create_upload.html', {'form' : form}, context_instance=RequestContext(request))
   114     return None, render_to_response('site/text_create_upload.html', {'form' : form}, context_instance=RequestContext(request))
   114 
   115 
   115 @has_global_perm('can_create_text')
   116 @has_global_perm('can_create_text')
   116 def text_create_upload(request):
   117 def text_create_upload(request):
   117     return _text_create_upload(request, CreateTextUploadForm)
   118     text, rep = _text_create_upload(request, CreateTextUploadForm)
       
   119     return rep
   118 
   120 
   119 def create_text(user, data):
   121 def create_text(user, data):
   120     text = Text.objects.create_text(title=data['title'],
   122     text = Text.objects.create_text(title=data['title'],
   121                                     format=data['format'],
   123                                     format=data['format'],
   122                                     content=data['content'],
   124                                     content=data['content'],