X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/085dd288093e1fd5455cc4db9f82998f05656a14..07539e8aca073150d034525fb67183a57a388286:/apps/explorer/models.py?ds=inline

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 0a3a252d..48d0247d 100644
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -56,15 +56,13 @@ class EditorPanel(models.Model):
     
 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
 
-
-class PullRequest(models.Model):
-
+class PullRequest(models.Model):    
     REQUEST_STATUSES = (
         ("N", "Pending for resolution"),
         ("R", "Rejected"),
@@ -78,7 +76,7 @@ class PullRequest(models.Model):
     document = models.CharField(max_length=255)
 
     # revision to be merged into the main branch
-    source_revision = models.CharField(max_length=40)
+    source_revision = models.CharField(max_length=40, unique=True)
 
     # current status
     status = models.CharField(max_length=1, choices=REQUEST_STATUSES)
@@ -87,7 +85,11 @@ class PullRequest(models.Model):
     response_comment = models.TextField(blank=True)
 
     # revision number in which the changes were merged (if any)
-    merged_rev = models.CharField(max_length=40, blank=True, null=True)        
+    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('.'))