Javascript refactoring. History view now displays tags

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index d816cf0..ca21988 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -1,8 +1,16 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.  
+#

 from django import forms
 from django import forms

-from wiki.models import Document, storage
+from wiki.models import Document, getstorage
+from django.utils.translation import ugettext_lazy as _ 

 
 
 class DocumentForm(forms.Form):
 
 
 class DocumentForm(forms.Form):

+    """ Old form for saving document's text """
+    

     name = forms.CharField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.Textarea)
     revision = forms.IntegerField(widget=forms.HiddenInput)
     name = forms.CharField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.Textarea)
     revision = forms.IntegerField(widget=forms.HiddenInput)


@@ -15,12 +23,11 @@ class DocumentForm(forms.Form):
             self.fields['name'].initial = document.name
             self.fields['text'].initial = document.text
             self.fields['revision'].initial = document.revision()
             self.fields['name'].initial = document.name
             self.fields['text'].initial = document.text
             self.fields['revision'].initial = document.revision()

-    
-    def get_storage(self):
-        return storage

         
     def save(self, document_author = 'anonymous'):
         
     def save(self, document_author = 'anonymous'):

-        document = Document(self.get_storage(), name=self.cleaned_data['name'], text=self.cleaned_data['text'])
+        storage = getstorage()
+        
+        document = Document(storage, name=self.cleaned_data['name'], text=self.cleaned_data['text'])

         
         storage.put(document, 
                 author = document_author, 
         
         storage.put(document, 
                 author = document_author, 


@@ -29,3 +36,44 @@ class DocumentForm(forms.Form):
         
         return storage.get(self.cleaned_data['name'])
 
         
         return storage.get(self.cleaned_data['name'])
 

+class DocumentTextSaveForm(forms.Form):
+    """ 
+    Form for saving document's text:
+           
+        * name - document's storage identifier.
+        * parent_revision - revision which the modified text originated from.
+        * comment - user's verbose comment; will be used in commit.
+        * stage_completed - mark this change as end of given stage.
+               
+    """
+    DOC_STAGES = (
+        ('', 'Nic konkretnego'),
+        ('tagging', 'Tagowanie'),
+        ('modernized', 'Uwspółcześnienia'),
+        ('editing', 'Redakcja'),
+    )    
+                
+    id = forms.CharField(widget=forms.HiddenInput)
+    parent_revision = forms.IntegerField(widget=forms.HiddenInput)
+    
+    author = forms.CharField(
+        required = False,
+        label = _(u"Autor"),
+        help_text = _(u"Twoje imie i nazwisko lub email.")
+         
+    )
+    
+    comment = forms.CharField(
+        required = False, 
+        widget=forms.Textarea,
+        label = _(u"Twój komentarz"),
+        help_text = _(u"Opisz w miarę dokładnie swoje zmiany."), 
+    )
+    
+    stage_completed = forms.ChoiceField(
+        choices=DOC_STAGES, 
+        required= False,        
+        label = _(u"Skończyłem robić"),
+        help_text = _(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."),
+    )
+    
\ No newline at end of file