|
@@ -10,6 +10,7 @@ from tg import expose, flash, require, url, lurl, request, redirect, tmpl_contex
|
10
|
10
|
from tg.i18n import ugettext as _, lazy_ugettext as l_
|
11
|
11
|
from tg import predicates as tgp
|
12
|
12
|
|
|
13
|
+from tg.i18n import ugettext as _, lazy_ugettext as l_
|
13
|
14
|
|
14
|
15
|
from pboard.lib.base import BaseController
|
15
|
16
|
from pboard.lib import dbapi as pld
|
|
@@ -18,6 +19,8 @@ from pboard import model as pm
|
18
|
19
|
|
19
|
20
|
__all__ = ['PODPublicApiController', 'PODApiController']
|
20
|
21
|
|
|
22
|
+FIXME_ERROR_CODE=-1
|
|
23
|
+
|
21
|
24
|
class PODPublicApiController(BaseController):
|
22
|
25
|
|
23
|
26
|
@expose()
|
|
@@ -167,7 +170,8 @@ class PODApiController(BaseController):
|
167
|
170
|
loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
|
168
|
171
|
|
169
|
172
|
loNode = loApiController.getNode(node_id)
|
170
|
|
- loApiController.moveNodeUpper(loNode)
|
|
173
|
+ if loApiController.moveNodeUpper(loNode)==FIXME_ERROR_CODE:
|
|
174
|
+ flash(_('Document #%s can\'t move upper.')%(node_id))
|
171
|
175
|
redirect(lurl('/document/%s'%(node_id)))
|
172
|
176
|
|
173
|
177
|
@expose()
|
|
@@ -176,7 +180,8 @@ class PODApiController(BaseController):
|
176
|
180
|
loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
|
177
|
181
|
|
178
|
182
|
loNode = loApiController.getNode(node_id)
|
179
|
|
- loApiController.moveNodeLower(loNode)
|
|
183
|
+ if loApiController.moveNodeLower(loNode)==FIXME_ERROR_CODE:
|
|
184
|
+ flash(_('Document #%s can\'t move lower.')%(node_id))
|
180
|
185
|
redirect(lurl('/document/%s'%(node_id)))
|
181
|
186
|
|
182
|
187
|
@expose()
|
|
@@ -222,6 +227,11 @@ class PODApiController(BaseController):
|
222
|
227
|
liParentId = loNode.parent_id
|
223
|
228
|
if loNode.getChildNb()<=0:
|
224
|
229
|
pm.DBSession.delete(loNode)
|
|
230
|
+ flash(_('Document #%s has been deleted')%(node_id))
|
|
231
|
+ else:
|
|
232
|
+ flash(_('Document #%s can\'t be deleted because it is not empty.')%(node_id), 'error')
|
|
233
|
+ redirect(lurl('/document/%s'%(node_id)))
|
|
234
|
+
|
225
|
235
|
redirect(lurl('/document/%i'%(liParentId or 0)))
|
226
|
236
|
|
227
|
237
|
@expose()
|