equal
deleted
inserted
replaced
196 newparams = params |
196 newparams = params |
197 elif self._edited_entity: |
197 elif self._edited_entity: |
198 path = self._edited_entity.rest_path() |
198 path = self._edited_entity.rest_path() |
199 else: |
199 else: |
200 path = 'view' |
200 path = 'view' |
201 url = self.build_url(path, **newparams) |
201 url = self._cw.build_url(path, **newparams) |
202 url = append_url_params(url, self.req.form.get('__redirectparams')) |
202 url = append_url_params(url, self.req.form.get('__redirectparams')) |
203 raise Redirect(url) |
203 raise Redirect(url) |
204 |
204 |
205 |
205 |
206 def _return_to_edition_view(self, newparams): |
206 def _return_to_edition_view(self, newparams): |
221 newparams['vid'] = form['__form_id'] |
221 newparams['vid'] = form['__form_id'] |
222 # re-insert copy redirection parameters |
222 # re-insert copy redirection parameters |
223 for redirectparam in NAV_FORM_PARAMETERS: |
223 for redirectparam in NAV_FORM_PARAMETERS: |
224 if redirectparam in form: |
224 if redirectparam in form: |
225 newparams[redirectparam] = form[redirectparam] |
225 newparams[redirectparam] = form[redirectparam] |
226 raise Redirect(self.build_url(path, **newparams)) |
226 raise Redirect(self._cw.build_url(path, **newparams)) |
227 |
227 |
228 |
228 |
229 def _return_to_lastpage(self, newparams): |
229 def _return_to_lastpage(self, newparams): |
230 """cancel-button case: in this case we are always expecting to go back |
230 """cancel-button case: in this case we are always expecting to go back |
231 where we came from, and this is not easy. Currently we suppose that |
231 where we came from, and this is not easy. Currently we suppose that |
233 request breadcrumbs for the last visited page. |
233 request breadcrumbs for the last visited page. |
234 """ |
234 """ |
235 if '__redirectpath' in self.req.form: |
235 if '__redirectpath' in self.req.form: |
236 # if redirect path was explicitly specified in the form, use it |
236 # if redirect path was explicitly specified in the form, use it |
237 path = self.req.form['__redirectpath'] |
237 path = self.req.form['__redirectpath'] |
238 url = self.build_url(path, **newparams) |
238 url = self._cw.build_url(path, **newparams) |
239 url = append_url_params(url, self.req.form.get('__redirectparams')) |
239 url = append_url_params(url, self.req.form.get('__redirectparams')) |
240 else: |
240 else: |
241 url = self.req.last_visited_page() |
241 url = self.req.last_visited_page() |
242 raise Redirect(url) |
242 raise Redirect(url) |
243 |
243 |