Hmm..

[redakcja.git] / apps / api / forms.py

diff --git a/apps/api/forms.py b/apps/api/forms.py
index 3c393a8..d55e629 100644 (file)
--- a/apps/api/forms.py
+++ b/apps/api/forms.py
@@ -10,20 +10,20 @@ from django import forms
 
 class MergeRequestForm(forms.Form):
     # should the target document revision be updated or shared
 
 class MergeRequestForm(forms.Form):
     # should the target document revision be updated or shared

-    type = forms.ChoiceField(choices=('update', 'share'))
+    type = forms.ChoiceField(choices=(('update', 'Update'), ('share', 'Share')) )

 
     # which revision to update/share
     target_revision = forms.RegexField('[0-9a-f]{40}')
 
     # any additional comments that user wants to add to the change
 
     # which revision to update/share
     target_revision = forms.RegexField('[0-9a-f]{40}')
 
     # any additional comments that user wants to add to the change

-    comment = forms.CharField(required=False)
+    message = forms.CharField(required=False)

 
 class DocumentUploadForm(forms.Form):
     ocr_file = forms.FileField(label='Source OCR file', required=False)
     ocr_data = forms.CharField(widget=forms.HiddenInput(), required=False)
     
     bookname = forms.RegexField(regex=r'[0-9\.\w_-]+',  \
 
 class DocumentUploadForm(forms.Form):
     ocr_file = forms.FileField(label='Source OCR file', required=False)
     ocr_data = forms.CharField(widget=forms.HiddenInput(), required=False)
     
     bookname = forms.RegexField(regex=r'[0-9\.\w_-]+',  \

-        label='Publication name', help_text='Example: slowacki-beniowski')
+        label='Publication name', help_text='Example: słowacki__beniowski__pieśń_1')

     
     generate_dc = forms.BooleanField(required=False, \
         initial=True, label=u"Generate DublinCore template")
     
     generate_dc = forms.BooleanField(required=False, \
         initial=True, label=u"Generate DublinCore template")