| ... |
... |
@@ -15,27 +15,24 @@ |
| 15 |
15 |
#elseif("$!request.xaction" == 'rename') |
| 16 |
16 |
#set ($newFullName = "$!{request.newCategoryName}") |
| 17 |
17 |
#if($newFullName.trim().equals('')) |
| 18 |
|
- $response.setStatus(400) |
| 19 |
|
- #error($msg.get('xe.blog.manageCategories.rename.error.emptyName')) |
|
18 |
+ #blog__actionResponseError(400, 'xe.blog.manageCategories.create.error.emptyName', []) |
| 20 |
20 |
#elseif(!$xwiki.exists($request.category)) |
| 21 |
|
- $response.setStatus(404) |
| 22 |
|
- #error($msg.get('thispagedoesnotexist')) |
|
20 |
+ #blog__actionResponseError(404, 'thispagedoesnotexist', []) |
| 23 |
23 |
#elseif($xwiki.exists($newFullName)) |
| 24 |
|
- $response.setStatus(409) |
| 25 |
|
- #error($msg.get('core.rename.alreadyExists', [$newFullName, $xwiki.getURL($newFullName)])) |
|
22 |
+ #blog__actionResponseError(409, 'core.rename.alreadyExists', [$newFullName, $xwiki.getURL($newFullName)]) |
| 26 |
26 |
#elseif(!$xwiki.hasAccessLevel('edit', $xcontext.user, $newFullName)) |
| 27 |
|
- $response.setStatus(403) |
| 28 |
|
- #error($msg.get('core.rename.targetNotWritable', [$newFullName])) |
|
24 |
+ #blog__actionResponseError(403, 'core.rename.targetNotWritable', [$newFullName]) |
| 29 |
29 |
#else |
| 30 |
30 |
#renameCategory($request.category, $newFullName) |
| 31 |
31 |
#end |
| 32 |
32 |
#elseif("$!request.xaction" == 'create') |
| 33 |
33 |
#set($title = "$!{request.newCategoryName}") |
|
30 |
+ #set($name = "${doc.space}.${title}") |
| 34 |
34 |
#if ($title.trim().equals('')) |
| 35 |
|
- $response.setStatus(400) |
| 36 |
|
- #error($msg.get('xe.blog.manageCategories.create.error.emptyName')) |
|
32 |
+ #blog__actionResponseError(400, 'xe.blog.manageCategories.create.error.emptyName', []) |
|
33 |
+ #elseif (!$xwiki.getDocument($name).isNew()) |
|
34 |
+ #blog__actionResponseError(409, 'xe.blog.manageCategories.create.error.alreadyExists', []) |
| 37 |
37 |
#else |
| 38 |
|
- #set($name = "${doc.space}.${title}") |
| 39 |
39 |
#set($title = $util.encodeURI($title)) |
| 40 |
40 |
#set($newCategoryParent = $util.encodeURI($request.newCategoryParent)) |
| 41 |
41 |
#if($request.ajax) |
| ... |
... |
@@ -64,7 +64,7 @@ |
| 64 |
64 |
#addCategoryForm() |
| 65 |
65 |
#elseif ("$!request.display" == 'renameForm') |
| 66 |
66 |
#renameCategoryForm() |
| 67 |
|
-#else |
|
64 |
+#elseif (!$request.ajax) |
| 68 |
68 |
## |
| 69 |
69 |
$xwiki.ssx.use('Blog.ManageCategories')## |
| 70 |
70 |
$xwiki.jsx.use('Blog.ManageCategories', {'minify':false})## |
