FIX: TypeError przy akceptacji Pull Requestów.

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

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 0a3a252..73e9063 100644 (file)
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -20,7 +20,8 @@ class EditorSettings(models.Model):
     Przykład:
     {
         'panels': [
     Przykład:
     {
         'panels': [

-            {'name': 'htmleditor', 'ratio': 0.5},
+            {'name': 'htmleditor',
+            'ratio': 0.5},

             {'name': 'gallery', 'ratio': 0.5}
         ],
         'recentFiles': [
             {'name': 'gallery', 'ratio': 0.5}
         ],
         'recentFiles': [


@@ -53,48 +54,17 @@ class EditorPanel(models.Model):
 
     def __unicode__(self):
         return self.display_name
 
     def __unicode__(self):
         return self.display_name

-    
-class Book(models.Model):
-    class Meta:
-        permissions = (
-            ("can_add_files", "Can do hg add."),
-        )
-        abstract=True
-    pass
-
-
-class PullRequest(models.Model):
-
-    REQUEST_STATUSES = (
-        ("N", "Pending for resolution"),
-        ("R", "Rejected"),
-        ("A", "Accepted & merged"),
-    )
-
-    comitter = models.ForeignKey(User) # the user who request the pull
-    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)
-
-    # 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)
-    merged_rev = models.CharField(max_length=40, blank=True, null=True)        
+# Yes, this is intentionally unnormalized !
+class GalleryForDocument(models.Model):
+    name = models.CharField(max_length=100)

     
     

-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('.'))
+    # directory containing scans under MEDIA_ROOT/
+    subpath = models.CharField(max_length=255)

 
 

+    # document associated with the gallery
+    document = models.CharField(max_length=255)

 
 

-def get_images_from_folder(folder):
-    return sorted(settings.MEDIA_URL + settings.IMAGE_DIR + u'/' + folder + u'/' + fn.decode('utf-8') for fn
-            in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
-            if not fn.decode('utf-8').startswith('.'))
-
+    def __unicode__(self):
+        return u"%s:%s" % (self.subpath, self.document)
\ No newline at end of file