Guénaël Muller 6 vuotta sitten
vanhempi
commit
5dd709ace8
2 muutettua tiedostoa jossa 20 lisäystä ja 10 poistoa
  1. 19 9
      tracim/tracim/controllers/content.py
  2. 1 1
      tracim/tracim/lib/webdav/__init__.py

+ 19 - 9
tracim/tracim/controllers/content.py Näytä tiedosto

@@ -582,9 +582,11 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
582 582
 
583 583
         tg.flash(_('Page created'), CST.STATUS_OK)
584 584
         redirect = '/workspaces/{}/folders/{}/pages/{}'
585
-        tg.redirect(tg.url(redirect).format(tmpl_context.workspace_id,
586
-                                            tmpl_context.folder_id,
587
-                                            page.content_id))
585
+        tg.redirect(tg.url(redirect).format(
586
+            tmpl_context.workspace_id,
587
+            tmpl_context.folder_id,
588
+            page.content_id)
589
+        )
588 590
 
589 591
     @tg.require(current_user_is_contributor())
590 592
     @tg.expose()
@@ -615,16 +617,24 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
615 617
             not_updated = '{} not updated: the content did not change'
616 618
             msg = _(not_updated).format(self._item_type_label)
617 619
             tg.flash(msg, CST.STATUS_WARNING)
618
-            tg.redirect(self._err_url.format(tmpl_context.workspace_id,
619
-                                             tmpl_context.folder_id,
620
-                                             item_id))
620
+            tg.redirect(
621
+                self._err_url.format(
622
+                    tmpl_context.workspace_id,
623
+                    tmpl_context.folder_id,
624
+                    item_id
625
+                )
626
+            )
621 627
         except ValueError as e:
622 628
             not_updated = '{} not updated - error: {}'
623 629
             msg = _(not_updated).format(self._item_type_label, str(e))
624 630
             tg.flash(msg, CST.STATUS_ERROR)
625
-            tg.redirect(self._err_url.format(tmpl_context.workspace_id,
626
-                                             tmpl_context.folder_id,
627
-                                             item_id))
631
+            tg.redirect(
632
+                self._err_url.format(
633
+                    tmpl_context.workspace_id,
634
+                    tmpl_context.folder_id,
635
+                    item_id
636
+                )
637
+            )
628 638
 
629 639
 class UserWorkspaceFolderThreadRestController(TIMWorkspaceContentRestController):
630 640
     """

+ 1 - 1
tracim/tracim/lib/webdav/__init__.py Näytä tiedosto

@@ -12,7 +12,7 @@ from tracim.model.data import ActionDescription
12 12
 from tracim.model.data import ContentType
13 13
 from tracim.model.data import Content
14 14
 from tracim.model.data import Workspace
15
-from wsgidav.dav_error import DAVError, HTTP_FORBIDDEN, HTTP_NOT_MODIFIED
15
+from wsgidav.dav_error import DAVError, HTTP_FORBIDDEN
16 16
 
17 17
 
18 18
 class HistoryType(object):