src/cm/views/texts.py
changeset 301 6e8fb4869d50
parent 279 46b0773c20c1
child 307 0cf1d1fc084c
equal deleted inserted replaced
300:7aaf5c0d6af4 301:6e8fb4869d50
   664         new_content = request.POST.get('content')
   664         new_content = request.POST.get('content')
   665         new_title = request.POST.get('title')
   665         new_title = request.POST.get('title')
   666         new_format = request.POST.get('format', text.last_text_version.format)
   666         new_format = request.POST.get('format', text.last_text_version.format)
   667         new_note = request.POST.get('note',None)
   667         new_note = request.POST.get('note',None)
   668         new_tags = request.POST.get('tags',None)
   668         new_tags = request.POST.get('tags',None)
       
   669         keep_comments = bool(request.POST.get('keep_comments',None))
   669         cancel_modified_scopes = (request.POST.get('cancel_modified_scopes',u'1') == u'1')
   670         cancel_modified_scopes = (request.POST.get('cancel_modified_scopes',u'1') == u'1')
   670         version = text.get_latest_version()
   671         version = text.get_latest_version()
   671         version.edit(new_title, new_format, new_content, new_tags, new_note, True, cancel_modified_scopes)
   672         version.edit(new_title, new_format, new_content, new_tags, new_note, keep_comments, cancel_modified_scopes)
   672 
   673 
   673         return version
   674         return version
   674 
   675 
   675     def save_new_version(self, text, request):
   676     def save_new_version(self, text, request):
   676         new_content = request.POST.get('content')
   677         new_content = request.POST.get('content')
   679         new_note = request.POST.get('note',None)
   680         new_note = request.POST.get('note',None)
   680         new_tags = request.POST.get('tags',None)
   681         new_tags = request.POST.get('tags',None)
   681         cancel_modified_scopes = (request.POST.get('cancel_modified_scopes',u'1') == u'1')
   682         cancel_modified_scopes = (request.POST.get('cancel_modified_scopes',u'1') == u'1')
   682         
   683         
   683         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)
   684         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)
   684         
   685 
   685         new_text_version.edit(new_title, new_format, new_content, new_tags, new_note, True, cancel_modified_scopes)
   686         keep_comments = bool(request.POST.get('keep_comments',None))
       
   687         new_text_version.edit(new_title, new_format, new_content, new_tags, new_note, keep_comments, cancel_modified_scopes)
   686         new_text_version.user = request.user if request.user.is_authenticated() else None
   688         new_text_version.user = request.user if request.user.is_authenticated() else None
   687         new_text_version.note = request.POST.get('note','')
   689         new_text_version.note = request.POST.get('note','')
   688         new_text_version.email = request.POST.get('email','')
   690         new_text_version.email = request.POST.get('email','')
   689         new_text_version.name = request.POST.get('name','')
   691         new_text_version.name = request.POST.get('name','')
   690         new_text_version.save()
   692         new_text_version.save()