fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dodanie flash messages.
[redakcja.git]
/
apps
/
explorer
/
models.py
diff --git
a/apps/explorer/models.py
b/apps/explorer/models.py
index
6d8cd8e
..
a8a8c3b
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': [
@@
-62,9
+63,7
@@
class Book(models.Model):
abstract=True
pass
abstract=True
pass
-
-class PullRequest(models.Model):
-
+class PullRequest(models.Model):
REQUEST_STATUSES = (
("N", "Pending for resolution"),
("R", "Rejected"),
REQUEST_STATUSES = (
("N", "Pending for resolution"),
("R", "Rejected"),
@@
-89,16
+88,18
@@
class PullRequest(models.Model):
# revision number in which the changes were merged (if any)
merged_rev = models.CharField(max_length=40, blank=True, null=True)
# revision number in which the changes were merged (if any)
merged_rev = models.CharField(max_length=40, blank=True, null=True)
-
def __unicode__(self):
return unicode(self.comitter) + u':' + self.document
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('.'))
+# Yes, this is intentionally unnormalized !
+class GalleryForDocument(models.Model):
+ name = models.CharField(max_length=100)
+
+ # directory containing scans under MEDIA_ROOT/
+ subpath = 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('.'))
+ # document associated with the gallery
+ document = models.CharField(max_length=255)
+ def __unicode__(self):
+ return u"%s:%s" % self.subpath, self.document
\ No newline at end of file