| changeset 71 | a865a5d0809a |
| parent 70 | 11b691c88348 |
| child 74 | c1b6828677db |
| 70:11b691c88348 | 71:a865a5d0809a |
|---|---|
640 fields = ('title', 'format', 'content', 'new_version', 'tags', 'note') |
640 fields = ('title', 'format', 'content', 'new_version', 'tags', 'note') |
641 |
641 |
642 def save_into_text(self, text, request): |
642 def save_into_text(self, text, request): |
643 new_content = request.POST.get('content') |
643 new_content = request.POST.get('content') |
644 new_title = request.POST.get('title') |
644 new_title = request.POST.get('title') |
645 new_format = request.POST.get('format') |
645 new_format = request.POST.get('format', text.last_text_version.format) |
646 new_note = request.POST.get('note',None) |
646 new_note = request.POST.get('note',None) |
647 new_tags = request.POST.get('tags',None) |
647 new_tags = request.POST.get('tags',None) |
648 version = text.get_latest_version() |
648 version = text.get_latest_version() |
649 version.edit(new_title, new_format, new_content, new_tags, new_note, True) |
649 version.edit(new_title, new_format, new_content, new_tags, new_note, True) |
650 |
650 |
658 new_text_version.name = request.POST.get('name','') |
658 new_text_version.name = request.POST.get('name','') |
659 new_text_version.save() |
659 new_text_version.save() |
660 |
660 |
661 new_content = request.POST.get('content') |
661 new_content = request.POST.get('content') |
662 new_title = request.POST.get('title') |
662 new_title = request.POST.get('title') |
663 new_format = request.POST.get('format') |
663 new_format = request.POST.get('format', text.last_text_version.format) |
664 new_note = request.POST.get('note',None) |
664 new_note = request.POST.get('note',None) |
665 new_tags = request.POST.get('tags',None) |
665 new_tags = request.POST.get('tags',None) |
666 new_text_version.edit(new_title, new_format, new_content, new_tags, new_note, True) |
666 new_text_version.edit(new_title, new_format, new_content, new_tags, new_note, True) |
667 |
667 |
668 return new_text_version |
668 return new_text_version |
672 empty_permitted=False, instance=None): |
672 empty_permitted=False, instance=None): |
673 ModelForm.__init__(self, data, files, auto_id, prefix, initial, error_class, label_suffix, empty_permitted, instance) |
673 ModelForm.__init__(self, data, files, auto_id, prefix, initial, error_class, label_suffix, empty_permitted, instance) |
674 |
674 |
675 # override manually to disabled |
675 # override manually to disabled |
676 format_field = self.fields['format'] |
676 format_field = self.fields['format'] |
677 format_field.widget.attrs = attrs={'disabled':'disabled'} |
677 format_field.widget.attrs = attrs={'disabled':'disabled'} |
678 format_field.required = False |
|
678 |
679 |
679 self.fields['format'] = format_field |
680 self.fields['format'] = format_field |
680 |
681 |
681 @has_perm_on_text('can_edit_text') |
682 @has_perm_on_text('can_edit_text') |
682 def text_pre_edit(request, key, adminkey=None): |
683 def text_pre_edit(request, key, adminkey=None): |