# HG changeset patch
# User raph
# Date 1261471183 -3600
# Node ID a865a5d0809af28c394db1c485b3090da438606b
# Parent  11b691c88348d970a7066d3fd3525545eaca1ece
format in text edit not required / add default to old value

diff -r 11b691c88348 -r a865a5d0809a src/cm/views/texts.py
--- a/src/cm/views/texts.py	Tue Dec 22 08:41:05 2009 +0100
+++ b/src/cm/views/texts.py	Tue Dec 22 09:39:43 2009 +0100
@@ -642,7 +642,7 @@
     def save_into_text(self, text, request):
         new_content = request.POST.get('content')
         new_title = request.POST.get('title')
-        new_format = request.POST.get('format')
+        new_format = request.POST.get('format', text.last_text_version.format)
         new_note = request.POST.get('note',None)
         new_tags = request.POST.get('tags',None)
         version = text.get_latest_version()
@@ -660,7 +660,7 @@
         
         new_content = request.POST.get('content')
         new_title = request.POST.get('title')
-        new_format = request.POST.get('format')        
+        new_format = request.POST.get('format', text.last_text_version.format)        
         new_note = request.POST.get('note',None)
         new_tags = request.POST.get('tags',None)
         new_text_version.edit(new_title, new_format, new_content, new_tags, new_note, True)
@@ -674,7 +674,8 @@
 
         # override manually to disabled
         format_field = self.fields['format']
-        format_field.widget.attrs = attrs={'disabled':'disabled'} 
+        format_field.widget.attrs = attrs={'disabled':'disabled'}
+        format_field.required = False
 
         self.fields['format'] = format_field