fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed 2 bugs from GT:
[redakcja.git]
/
apps
/
explorer
/
models.py
diff --git
a/apps/explorer/models.py
b/apps/explorer/models.py
index
0a3a252
..
7ab6b09
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': [
@@
-56,15
+57,13
@@
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):
-
+class PullRequest(models.Model):
REQUEST_STATUSES = (
("N", "Pending for resolution"),
("R", "Rejected"),
REQUEST_STATUSES = (
("N", "Pending for resolution"),
("R", "Rejected"),
@@
-78,7
+77,7
@@
class PullRequest(models.Model):
document = models.CharField(max_length=255)
# revision to be merged into the main branch
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)
# current status
status = models.CharField(max_length=1, choices=REQUEST_STATUSES)
@@
-87,14
+86,20
@@
class PullRequest(models.Model):
response_comment = models.TextField(blank=True)
# revision number in which the changes were merged (if any)
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)
-
-
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('.'))
+ merged_rev = models.CharField(max_length=40, blank=True, null=True)
+
+
def __unicode__(self
):
+ return unicode(self.comitter) + u':' + self.document
+# 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