Skip to content

Commit 5541789

Browse files
Enygma2002Enygma2002
committed
XWIKI-7152: Use script service everywhere for accessing the wiki manager and application manager plugins
1 parent 2a7601f commit 5541789

File tree

17 files changed

+22
-22
lines changed

17 files changed

+22
-22
lines changed

‎xwiki-platform-core/xwiki-platform-application-manager/xwiki-platform-application-manager-api/src/main/resources/sheets/XAppSheets.XWikiApplicationClassSheet.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#set($Appmanager = $xwiki.applicationmanager)
1+
#set($Appmanager = $services.applicationmanager)
22
#set($Exception = $Appmanager.DefaultException)
33
##
44
#set($object = $doc.getObject("XAppClasses.XWikiApplicationClass"))

‎xwiki-platform-core/xwiki-platform-watchlist/xwiki-platform-watchlist-ui/src/main/resources/XWiki/XWikiUserWatchListLiveTableResults.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
"id" : "$!listtool.get($element, 0)",
9191
"type" : "$!listtool.get($element, 1)",
9292
#set($wikiName = $!listtool.get($element, 2))
93-
#if($xwiki.isVirtualMode() && $xwiki.wikimanager)
94-
#set($wikiPrettyName = $xwiki.wikimanager.getWikiDocument($wikiName).getWikiPrettyName())
93+
#if($xwiki.isVirtualMode() && $services.wikimanager)
94+
#set($wikiPrettyName = $services.wikimanager.getWikiDocument($wikiName).getWikiPrettyName())
9595
#if("$!wikiPrettyName.trim()" != '')
9696
#set($wikiName = $wikiPrettyName)
9797
#end

‎xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/menuview.vm

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
#set ($wikiEntryId = 'tmWorkspace')
159159
#end
160160
#end
161-
#if ($xwiki.isVirtualMode() && $xwiki.wikimanager)
162-
#set ($wikiName = $xwiki.wikimanager.getWikiDocument($xcontext.getDatabase()).getWikiPrettyName())
161+
#if ($services.isVirtualMode() && $services.wikimanager)
162+
#set ($wikiName = $services.wikimanager.getWikiDocument($xcontext.getDatabase()).getWikiPrettyName())
163163
#if ("$!wikiName.trim()" == '')
164164
#set ($wikiName = $xcontext.getDatabase())
165165
#end

‎xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-api/src/main/resources/sheets/XWiki.XWikiServerClassSheet.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#set ($WikiManager = $xwiki.wikimanager)
1+
#set ($WikiManager = $services.wikimanager)
22
#set ($Exception = $WikiManager.DefaultException)
33
##
44
#set ($action = $request.getParameter("action"))

‎xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/IsWikiOrDatabaseAvailableService.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<syntaxId>xwiki/1.0</syntaxId>
2424
<hidden>false</hidden>
2525
<content>#if ($request.wikiname)
26-
#if (!$xwiki.wikimanager.isWikiNameAvailable($request.wikiname))
26+
#if (!$services.wikimanager.isWikiNameAvailable($request.wikiname))
2727
#if ($services.wikimanager.getWikiFromName($request.wikiname).isNew())
2828
database#else
2929
wiki#end

‎xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/LastWikiModificationsCode.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#set($usermodificationswiki = $request.userwiki)
4343
#end
4444
#############################################################################
45-
#set($WikiManager = $xwiki.wikimanager)
45+
#set($WikiManager = $services.wikimanager)
4646
#if(!$WikiManager)
4747
#error($msg.get("wikimanager.pluginnotenabled"))
4848
#end

‎xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiCode/UserWikisIsUserWidget.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
##
109109
#includeMacros("WikiCode.Macros")
110110
##
111-
#set($WikiManager = $xwiki.wikimanager)
111+
#set($WikiManager = $services.wikimanager)
112112
#if(!$WikiManager)
113113
#error($msg.get("wikimanager.pluginnotenabled"))
114114
#end

‎xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiManager/CreateNewWiki.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
#if (!$WikiManager)
7979
#error($msg.get("wikimanager.pluginnotenabled"))
8080
#end
81-
#if (!$xwiki.applicationmanager)
81+
#if (!$services.applicationmanager)
8282
#error($msg.get("xapp.pluginnotenabled"))
8383
#end
8484
#if(!$xwiki.isVirtualMode())

‎xwiki-platform-core/xwiki-platform-wiki-manager/xwiki-platform-wiki-manager-ui/src/main/resources/WikiManager/WebHome.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $xwiki.ssfx.use("js/xwiki/table/table.css")##
3232
#if(!$WikiManager)
3333
#error($msg.get("wikimanager.pluginnotenabled"))
3434
#end
35-
#if(!$xwiki.applicationmanager)
35+
#if(!$services.applicationmanager)
3636
#error($msg.get("xapp.pluginnotenabled"))
3737
#end
3838
##

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-template-features/src/main/resources/Main/Dashboard.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393
<guid>3cfb2ec3-76e5-4627-a681-46882fd06cc9</guid>
394394
<property>
395395
<content>{{velocity}}
396-
#set($AppManager = $xwiki.applicationmanager)
396+
#set($AppManager = $services.applicationmanager)
397397
#if(!$AppManager)
398398
#error($msg.get("xapp.pluginnotenabled"))
399399
#else

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-template-features/src/main/resources/Main/WebHome.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<date>1301083063000</date>
1515
<contentUpdateDate>1301083063000</contentUpdateDate>
1616
<version>1.1</version>
17-
<title>#set($wikiDescriptor = $xwiki.wikimanager.getWikiDocument($xcontext.database))#{if}("$!wikiDescriptor.getValue('wikiprettyname')" != '')$wikiDescriptor.getValue('wikiprettyname')#{else}$wikiDescriptor.wikiName#{end}</title>
17+
<title>#set($wikiDescriptor = $services.wikimanager.getWikiDocument($xcontext.database))#{if}("$!wikiDescriptor.getValue('wikiprettyname')" != '')$wikiDescriptor.getValue('wikiprettyname')#{else}$wikiDescriptor.wikiName#{end}</title>
1818
<template></template>
1919
<defaultTemplate></defaultTemplate>
2020
<validationScript></validationScript>

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/BrowseWorkspacesLiveTableResultsMacros.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
#set($itemDoc = $xwiki.getDocument($item))
224224
#set($fullname = "${itemDoc.wiki}:${itemDoc.space}.${itemDoc.name}")
225225
#set($discard = $itemDoc.use($className))
226-
#set ($itemWikiDocument = $xwiki.wikimanager.getWikiFromDocumentName($itemDoc.fullName))
226+
#set ($itemWikiDocument = $services.wikimanager.getWikiFromDocumentName($itemDoc.fullName))
227227
#set ($itemWikiDescriptor = $itemWikiDocument.firstWikiAlias)
228228
#set ($itemWikiName = $itemWikiDescriptor.wikiName)
229229
#set ($workspace = $WorkspaceManager.getWorkspace($itemWikiName))

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/CreateNewWorkspace.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,11 @@ function prettyNameChanged()
263263
#if (!$WorkspaceManager)
264264
#error($msg.get("workspacemanager.pluginnotenabled"))
265265
#end
266-
#set ($WikiManager = $xwiki.wikimanager)
266+
#set ($WikiManager = $services.wikimanager)
267267
#if (!$WikiManager)
268268
#error($msg.get("wikimanager.pluginnotenabled"))
269269
#end
270-
#if (!$xwiki.applicationmanager)
270+
#if (!$services.applicationmanager)
271271
#error($msg.get("xapp.pluginnotenabled"))
272272
#end
273273
#if(!$xwiki.isVirtualMode())

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/Install.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
## 3. Install template
9191
##
9292
#if (!$WikiManager)
93-
#set ($WikiManager = $xwiki.wikimanager)
93+
#set ($WikiManager = $services.wikimanager)
9494
#if (!$WikiManager)
9595

9696
{{error}}$msg.get('wikimanager.pluginnotenabled'){{/error}}
9797
#end
9898
#end
99-
#if (!$xwiki.applicationmanager)
99+
#if (!$services.applicationmanager)
100100

101101
{{error}}$msg.get('xapp.pluginnotenabled'){{/error}}
102102
#end

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/Workspaces.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ $xwiki.ssx.use('WorkspaceManager.Workspaces')
283283
## List workspaces.
284284
##
285285
#foreach($workspaceDocumentName in $workspaceDocumentsList)
286-
#set ($workspaceWikiDocument = $xwiki.wikimanager.getWikiFromDocumentName($workspaceDocumentName))
286+
#set ($workspaceWikiDocument = $services.wikimanager.getWikiFromDocumentName($workspaceDocumentName))
287287
#set ($workspaceWikiDescriptor = $workspaceWikiDocument.firstWikiAlias)
288288
&lt;li id='spWorkspaceItem' class='xitem xunderline xhighlight workspace'&gt;
289289
&lt;div class='xitemcontainer'&gt;

‎xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/WorkspacesSuggestLuceneService.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
&lt;results&gt;
4141
#foreach($item in $results)
4242
#set($itemfullname = "${item.wiki}:${item.space}.${item.name}")
43-
#set($itemWikiDocument = $xwiki.wikimanager.getWikiFromDocumentName($itemfullname))
43+
#set($itemWikiDocument = $services.wikimanager.getWikiFromDocumentName($itemfullname))
4444
#set($itemWikiDescriptor = $itemWikiDocument.firstWikiAlias)
4545
#set($name = $itemWikiDescriptor.wikiprettyname)
4646
#set($url = $itemWikiDescriptor.homePageUrl)

‎xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/src/test/resources/SampleWikiXMLDocument.input

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
<tags/>
5555
</property>
5656
</object>
57-
<content>#set($WikiManager = $xwiki.wikimanager)
57+
<content>#set($WikiManager = $services.wikimanager)
5858
#if(!$WikiManager)
5959
#error($msg.get("wikimanager.pluginnotenabled"))
6060
#end
61-
#if(!$xwiki.applicationmanager)
61+
#if(!$services.applicationmanager)
6262
#error($msg.get("xapp.pluginnotenabled"))
6363
#end
6464

0 commit comments

Comments
 (0)