Changes for page Administration

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

Page properties

Content

...	...	@@ -9,7 +9,7 @@
9	9	#set ($adminAction = 'admin')
10	10	#set ($crtCategoryId = "$!{request.category}")
11	11	#if ($crtCategoryId != '')
12		- #set ($crtCategoryId = $mathtool.toInteger($crtCategoryId))
	12	+ #set ($crtCategoryId = $numbertool.toNumber($crtCategoryId).intValue())
13	13	#end
14	14	#set ($crtSectionId = "$!{request.section}")
15	15
...	...	@@ -87,7 +87,7 @@
87	87	#set ($crtCategory = $NULL)
88	88	#foreach ($category in $adminMenu)
89	89	## "Standard" URLs and icons for categories
90		- #set ($category.url = $xwiki.getURL($currentDoc, $adminAction, "category=${mathtool.sub($velocityCount, 1)}"))
	90	+ #set ($category.url = $xwiki.getURL($currentDoc, $adminAction, "category=${mathtool.sub($foreach.count, 1)}"))
91	91	#if ($xwiki.getDocument('XWiki.AdminSheet').getAttachment("${category.id}.png"))
92	92	#set ($category.iconReference = "XWiki.AdminSheet@${category.id}.png")
93	93	#else
...	...	@@ -96,7 +96,7 @@
96	96	#set ($category.description = $services.localization.render("admin.${category.id}.description").trim())
97	97	#set ($category.cssClass = "${category.id}Icon")
98	98	#set ($category.name = $services.localization.render("admin.${category.id}").trim())
99		- #if ("$!{crtCategoryId}" != '' && $velocityCount == $mathtool.add($crtCategoryId, 1))
	99	+ #if ("$!{crtCategoryId}" != '' && $foreach.count == $mathtool.add($crtCategoryId, 1))
100	100	#set ($crtCategory = $category)
101	101	#end
102	102	##
...	...	@@ -367,11 +367,8 @@
367	367	##------------------------------------------------------------------------------------------------------------
368	368	## The Administration allows editing other pages from different applications inside the admin context (UI)
369	369	##------------------------------------------------------------------------------------------------------------
370		- #if ("$!{request.editmode}" == 'inline' && $xwiki.exists($section))
371		- #set ($discard = $xcontext.setDisplayMode('edit'))
372		- {{html clean="false"}}{{include reference="XWiki.AdminInlineSheet" /}}{{/html}}
373		- #elseif ($xwiki.exists("XWiki.Admin${section}Sheet"))
374		- ## Custom XE administration section
	370	+ #if ($xwiki.exists("XWiki.Admin${section}Sheet"))
	371	+ ## Handle known XWiki administration sections
375	375	{{include reference="XWiki.Admin${section}Sheet" /}}
376	376	#elseif ($xwiki.exists($section))
377	377	{{html clean="false"}}#includeForm($section){{/html}}

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -26,7 +26,7 @@
26	26	// Filter the categories.
27	27	panelGroup.find('a.panel-heading').each(function() {
28	28	var panel = $(this).closest('.panel');
29		- var hasVisibleSections = panel.find('.list-group-item').not('.hidden').size() > 0;
	29	+ var hasVisibleSections = panel.find('.list-group-item').not('.hidden').length > 0;
30	30	var matchesFilterQuery = !filterItem.call($(this), text);
31	31	panel.toggle(hasVisibleSections || matchesFilterQuery);
32	32	if (!hasVisibleSections && matchesFilterQuery) {
...	...	@@ -50,7 +50,7 @@
50	50	.next('.panel-collapse').addClass('in').css('height', '');
51	51	}
52	52	// Show/Hide the "No results." message.
53		- var hasVisibleCategories = panelGroup.find('a.panel-heading').filter(':visible').size() > 0;
	53	+ var hasVisibleCategories = panelGroup.find('a.panel-heading').filter(':visible').length > 0;
54	54	panelGroup.find('.noitems').toggleClass('hidden', hasVisibleCategories);
55	55	};
56	56
...	...	@@ -61,7 +61,7 @@
61	61	var panelGroup = $(this).closest('.panel-group');
62	62	var text = $(this).val().toLowerCase();
63	63	// Schedule a new filter operation.
64		- timeoutId = setTimeout($.proxy(filterPanelGroup, panelGroup, text), 500);
	64	+ timeoutId = setTimeout(filterPanelGroup.bind(panelGroup, text), 500);
65	65
66	66	// Finally, enable the search input.
67	67	}).prop('disabled', false);