Zmiana typu błędnie oznaczonego szablonu z text/javascript na text/html.

[redakcja.git] / apps / explorer / models.py

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index a1cb56c..48d0247 100644 (file)
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -56,28 +56,40 @@ class EditorPanel(models.Model):
     
 class Book(models.Model):
     class Meta:
     
 class Book(models.Model):
     class Meta:

-        permissions = (
-            ("can_add_files", "Can do hg add."),
+        permissions = (            
+            ("can_share", "Can share documents without pull requests."),

         )
         abstract=True
     pass
 
         )
         abstract=True
     pass
 

+class PullRequest(models.Model):    
+    REQUEST_STATUSES = (
+        ("N", "Pending for resolution"),
+        ("R", "Rejected"),
+        ("A", "Accepted & merged"),
+    )

 
 

-class PullRequest(models.Model):
-    comitter = models.ForeignKey(User) # the user who request the pull 
-    file = models.CharField(max_length=256) # the file to request
-    source_rev = models.CharField(max_length=40) # revision number of the commiter
-
+    comitter = models.ForeignKey(User) # the user who request the pull

     comment = models.TextField() # addtional comments to the request
 
     comment = models.TextField() # addtional comments to the request
 

+    # document to merge
+    document = models.CharField(max_length=255)
+
+    # revision to be merged into the main branch
+    source_revision = models.CharField(max_length=40, unique=True)
+
+    # current status
+    status = models.CharField(max_length=1, choices=REQUEST_STATUSES)
+
+    # comment to the status change of request (if applicable)
+    response_comment = models.TextField(blank=True)
+

     # revision number in which the changes were merged (if any)
     # revision number in which the changes were merged (if any)

-    merged_rev = models.CharField(max_length=40, null=True) 
-    
-    def __unicode__(self):
-        return u"Pull request from %s, source: %s %s, status: %s." % \
-            (self.commiter, self.file, self.source_rev, \
-                (("merged into "+self.merged_rev) if self.merged_rev else "pending") )
+    merged_rev = models.CharField(max_length=40, blank=True, null=True)

 
 

+
+    def __unicode__(self):
+        return unicode(self.comitter) + u':' + self.document

     
 def get_image_folders():
     return sorted(fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.'))
     
 def get_image_folders():
     return sorted(fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.'))