fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to pull/push logic.
[redakcja.git]
/
apps
/
api
/
handlers
/
library_handlers.py
diff --git
a/apps/api/handlers/library_handlers.py
b/apps/api/handlers/library_handlers.py
old mode 100644
(file)
new mode 100755
(executable)
index
a328582
..
562ed1b
--- a/
apps/api/handlers/library_handlers.py
+++ b/
apps/api/handlers/library_handlers.py
@@
-388,7
+388,7
@@
class DocumentGalleryHandler(BaseHandler):
gallery['pages'].append( quote(url.encode('utf-8')) )
gallery['pages'].append( quote(url.encode('utf-8')) )
-
#
gallery['pages'].sort()
+ gallery['pages'].sort()
galleries.append(gallery)
return galleries
galleries.append(gallery)
return galleries
@@
-512,7
+512,7
@@
class MergeHandler(BaseHandler):
"message": "You must first update your branch to the latest version."
})
"message": "You must first update your branch to the latest version."
})
- if
base_doc.parentof(doc) or base_doc.has_parent_from(doc
):
+ if
not base_doc.would_share(
):
return response.SuccessAllOk().django_response({
"result": "no-op"
})
return response.SuccessAllOk().django_response({
"result": "no-op"
})