X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e4722e5fe52bb4682bee8878bc24dcaaf557b591..70f40902039374237390366dd06319fed5c45ee7:/apps/explorer/models.py?ds=sidebyside

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 7e416a38..10491f6a 100644
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -19,6 +19,22 @@ class PanelSettings(models.Model):
         return u"Panel settings for %s" % self.user.name
 
 
+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
+
+    comment = models.TextField() # addtional comments to the request
+
+    # 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") )
+
+    
 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('.'))
 
@@ -28,3 +44,5 @@ def get_images_from_folder(folder):
             in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
             if not fn.startswith('.'))
 
+def user_branch(user):
+    return 'personal_'+user.username