Skip to content
Permalink
Browse files Browse the repository at this point in the history
XWIKI-19748: Wrong error code in tags
  * Fix the error code when manipulating tags
  • Loading branch information
surli committed Jun 2, 2022
1 parent b4697bf commit 7fd4cda
Showing 1 changed file with 27 additions and 19 deletions.
Expand Up @@ -112,19 +112,23 @@ $xwiki.ssx.use('Main.Tags')##
</form>
{{/html}}
#elseif ($do == 'renameTag')
##
## Rename tag
##
#set ($renameTo = "$!{request.get('renameTo')}")
#set ($success = false)
#if ($renameTo != '')
#set ($success = $xwiki.tag.renameTag($tag, $renameTo))
#end
#if ($success == true || $success == 'OK')
#set ($urlEscapedRenameTo = $escapetool.url($renameTo))
$response.sendRedirect($doc.getURL('view', "do=viewTag&tag=${urlEscapedRenameTo}&renamedTag=${urlEscapedTag}"))
#if (!$services.csrf.isTokenValid($request.get('form_token')))
#set ($discard = $response.sendError(401, "Wrong CSRF token"))
#else
{{error}}$services.localization.render('xe.tag.rename.failure', ["//${wikiEscapedTag}//", "//${services.rendering.escape($renameTo, 'xwiki/2.1')}//"]){{/error}}
##
## Rename tag
##
#set ($renameTo = "$!{request.get('renameTo')}")
#set ($success = false)
#if ($renameTo != '')
#set ($success = $xwiki.tag.renameTag($tag, $renameTo))
#end
#if ($success == true || $success == 'OK')
#set ($urlEscapedRenameTo = $escapetool.url($renameTo))
$response.sendRedirect($doc.getURL('view', "do=viewTag&tag=${urlEscapedRenameTo}&renamedTag=${urlEscapedTag}"))
#else
{{error}}$services.localization.render('xe.tag.rename.failure', ["//${wikiEscapedTag}//", "//${services.rendering.escape($renameTo, 'xwiki/2.1')}//"]){{/error}}
#end
#end
#elseif ($do == 'prepareDelete')
##
Expand All @@ -142,14 +146,18 @@ $xwiki.ssx.use('Main.Tags')##
</form>
{{/html}}
#elseif ($do == 'deleteTag')
##
## Delete tag
##
#set ($success = $xwiki.tag.deleteTag($tag))
#if ($success == true || $success == 'OK')
$response.sendRedirect($doc.getURL('view', "deletedTag=${urlEscapedTag}"))
#if (!$services.csrf.isTokenValid($request.get('form_token')))
#set ($discard = $response.sendError(401, "Wrong CSRF token"))
#else
{{error}}$services.localization.render('xe.tag.delete.failure', ["//${wikiEscapedTag}//"]){{/error}}
##
## Delete tag
##
#set ($success = $xwiki.tag.deleteTag($tag))
#if ($success == true || $success == 'OK')
$response.sendRedirect($doc.getURL('view', "deletedTag=${urlEscapedTag}"))
#else
{{error}}$services.localization.render('xe.tag.delete.failure', ["//${wikiEscapedTag}//"]){{/error}}
#end
#end
#else
##
Expand Down

0 comments on commit 7fd4cda

Please sign in to comment.