Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -13,7 +13,6 @@
13	13	##
14	14	#set ($do = "$!{request.get('do')}")
15	15	#set ($tag = "$!{request.get('tag')}")
16		-#set ($wikiEscapedTag = $services.rendering.escape($tag, 'xwiki/2.1'))
17	17	#set ($urlEscapedTag = $escapetool.url($tag))
18	18	#set ($htmlEscapedTag = $escapetool.xml($tag))
19	19	##
...	...	@@ -21,7 +21,7 @@
21	21	##
22	22	#macro (displayTagAppTitle $urlEscapedTag $htmlEscapedTag $displayButtons)
23	23	(% class="xapp" %)
24		- = (% class="highlight tag" %)${wikiEscapedTag}##
	23	+ = (% class="highlight tag" %)${tag}##
25	25	#if ($xwiki.hasAdminRights() && $displayButtons) ##
26	26	[[$services.localization.render('xe.tag.rename.link')>>||queryString="do=prepareRename&tag=${urlEscapedTag}" class="button rename" rel="nofollow"]] [[$services.localization.render('xe.tag.delete.link')>>||queryString="do=prepareDelete&tag=${urlEscapedTag}" class="button delete" rel="nofollow"]]##
27	27	#end
...	...	@@ -37,7 +37,7 @@
37	37	##
38	38	#displayTagAppTitle($urlEscapedTag $htmlEscapedTag true)
39	39	#if ("$!{request.get('renamedTag')}" != '')
40		- {{info}}$services.localization.render('xe.tag.rename.success', ["//${services.rendering.escape(${request.get('renamedTag')}, 'xwiki/2.1')}//"]){{/info}}
	39	+ {{info}}$services.localization.render('xe.tag.rename.success', ["//${request.get('renamedTag')}//"]){{/info}}
41	41
42	42	#end
43	43	#set ($list = $xwiki.tag.getDocumentsWithTag($tag))
...	...	@@ -44,7 +44,7 @@
44	44	{{container layoutStyle="columns"}}
45	45	(((
46	46	(% class="xapp" %)
47		- === $services.localization.render('xe.tag.alldocs', ["//${wikiEscapedTag}//"]) ===
	46	+ === $services.localization.render('xe.tag.alldocs', ["//${tag}//"]) ===
48	48
49	49	#if ($list.size()> 0)
50	50	{{html}}#displayDocumentList($list false $blacklistedSpaces){{/html}}
...	...	@@ -54,8 +54,8 @@
54	54	)))
55	55	(((
56	56	(% class="xapp" %)
57		- === $services.localization.render('xe.tag.activity', ["//${wikiEscapedTag}//"]) ===
58		- {{notifications useUserPreferences="false" displayOwnEvents="true" tags="$wikiEscapedTag" displayRSSLink="true" /}}
	56	+ === $services.localization.render('xe.tag.activity', ["//${tag}//"]) ===
	57	+ {{notifications useUserPreferences="false" displayOwnEvents="true" tags="$tag" displayRSSLink="true" /}}
59	59	)))
60	60	{{/container}}
61	61	#elseif ($do == 'prepareRename')
...	...	@@ -74,23 +74,19 @@
74	74	</form>
75	75	{{/html}}
76	76	#elseif ($do == 'renameTag')
77		- #if (!$services.csrf.isTokenValid($request.get('form_token')))
78		- #set ($discard = $response.sendError(401, "Wrong CSRF token"))
	76	+ ##
	77	+ ## Rename tag
	78	+ ##
	79	+ #set ($renameTo = "$!{request.get('renameTo')}")
	80	+ #set ($success = false)
	81	+ #if ($renameTo != '')
	82	+ #set ($success = $xwiki.tag.renameTag($tag, $renameTo))
	83	+ #end
	84	+ #if ($success == true || $success == 'OK')
	85	+ #set ($urlEscapedRenameTo = $escapetool.url($renameTo))
	86	+ $response.sendRedirect($doc.getURL('view', "do=viewTag&tag=${urlEscapedRenameTo}&renamedTag=${urlEscapedTag}"))
79	79	#else
80		- ##
81		- ## Rename tag
82		- ##
83		- #set ($renameTo = "$!{request.get('renameTo')}")
84		- #set ($success = false)
85		- #if ($renameTo != '')
86		- #set ($success = $xwiki.tag.renameTag($tag, $renameTo))
87		- #end
88		- #if ($success == true || $success == 'OK')
89		- #set ($urlEscapedRenameTo = $escapetool.url($renameTo))
90		- $response.sendRedirect($doc.getURL('view', "do=viewTag&tag=${urlEscapedRenameTo}&renamedTag=${urlEscapedTag}"))
91		- #else
92		- {{error}}$services.localization.render('xe.tag.rename.failure', ["//${wikiEscapedTag}//", "//${services.rendering.escape($renameTo, 'xwiki/2.1')}//"]){{/error}}
93		- #end
	88	+ {{error}}$services.localization.render('xe.tag.rename.failure', ["//${tag}//", "//${renameTo}//"]){{/error}}
94	94	#end
95	95	#elseif ($do == 'prepareDelete')
96	96	##
...	...	@@ -108,18 +108,14 @@
108	108	</form>
109	109	{{/html}}
110	110	#elseif ($do == 'deleteTag')
111		- #if (!$services.csrf.isTokenValid($request.get('form_token')))
112		- #set ($discard = $response.sendError(401, "Wrong CSRF token"))
	106	+ ##
	107	+ ## Delete tag
	108	+ ##
	109	+ #set ($success = $xwiki.tag.deleteTag($tag))
	110	+ #if ($success == true || $success == 'OK')
	111	+ $response.sendRedirect($doc.getURL('view', "deletedTag=${urlEscapedTag}"))
113	113	#else
114		- ##
115		- ## Delete tag
116		- ##
117		- #set ($success = $xwiki.tag.deleteTag($tag))
118		- #if ($success == true || $success == 'OK')
119		- $response.sendRedirect($doc.getURL('view', "deletedTag=${urlEscapedTag}"))
120		- #else
121		- {{error}}$services.localization.render('xe.tag.delete.failure', ["//${wikiEscapedTag}//"]){{/error}}
122		- #end
	113	+ {{error}}$services.localization.render('xe.tag.delete.failure', ["//${tag}//"]){{/error}}
123	123	#end
124	124	#else
125	125	##
...	...	@@ -127,7 +127,7 @@
127	127	##
128	128	#set ($title = 'All Tags')
129	129	#if ("$!{request.get('deletedTag')}" != '')
130		- {{info}}$services.localization.render('xe.tag.delete.success', ["//${services.rendering.escape($request.get('deletedTag'), 'xwiki/2.1')}//"]){{/info}}
	121	+ {{info}}$services.localization.render('xe.tag.delete.success', ["//${request.get('deletedTag')}//"]){{/info}}
131	131
132	132	#end
133	133	{{tagcloud/}}