Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Contenu

...	...	@@ -9,12 +9,7 @@
9	9
10	10	#macro (getPaidExtensions)
11	11	#set ($paidExtensionsByNamespace = $services.extension.installed.getBackwardDependencies($licensorId))
12		- ## CollectionsTool is deprecated since 12.1RC1.
13		- #if ($collectiontool)
14		- #set ($paidExtensions = $collectiontool.set)
15		- #else
16		- #set ($paidExtensions = $collectionstool.set)
17		- #end
	12	+ #set ($paidExtensions = $collectionstool.set)
18	18	#foreach ($paidExtensionsOnNamespace in $paidExtensionsByNamespace.values())
19	19	#set ($discard = $paidExtensions.addAll($paidExtensionsOnNamespace))
20	20	#end
...	...	@@ -22,12 +22,7 @@
22	22
23	23	#macro (getVisiblePaidExtensions)
24	24	#getPaidExtensions
25		- ## CollectionsTool is deprecated since 12.1RC1.
26		- #if ($collectiontool)
27		- #set ($visiblePaidExtensions = $collectiontool.set)
28		- #else
29		- #set ($visiblePaidExtensions = $collectionstool.set)
30		- #end
	20	+ #set ($visiblePaidExtensions = $collectionstool.set)
31	31	#foreach ($paidExtension in $paidExtensions)
32	32	## Filter out the paid extensions that are dependencies of other paid extensions (because the license of a paid
33	33	## extension should cover its paid dependencies).
...	...	@@ -40,12 +40,7 @@
40	40
41	41	#macro (isRequiredBy $installedExtension $extensions)
42	42	#set ($isRequiredBy = false)
43		- ## CollectionsTool is deprecated since 12.1RC1.
44		- #if ($collectiontool)
45		- #set ($backwardDependencies = $collectiontool.queue)
46		- #else
47		- #set ($backwardDependencies = $collectionstool.queue)
48		- #end
	33	+ #set ($backwardDependencies = $collectionstool.queue)
49	49	#addBackwardDependencies($installedExtension $backwardDependencies)
50	50	## We can't iterate the queue while modifying it and we can't write a "while" loop in Velocity so we're forced to
51	51	## rely on a range loop (limiting the number of backward dependencies that we analyze).
...	...	@@ -65,12 +65,7 @@
65	65	#end
66	66
67	67	#macro (addBackwardDependencies $installedExtension $backwardDependencies)
68		- ## CollectionsTool is deprecated since 12.1RC1.
69		- #if ($collectiontool)
70		- #set ($backwardDependenciesSet = $collectiontool.set)
71		- #else
72		- #set ($backwardDependenciesSet = $collectionstool.set)
73		- #end
	53	+ #set ($backwardDependenciesSet = $collectionstool.set)
74	74	#set ($discard = $backwardDependenciesSet.addAll($backwardDependencies))
75	75	#set ($backwardDependenciesByNamespace = $services.extension.installed.getBackwardDependencies($installedExtension.id))
76	76	#foreach ($backwardDependenciesOnNamespace in $backwardDependenciesByNamespace.values())
...	...	@@ -162,30 +162,6 @@
162	162	data-button="$escapetool.xml($jsontool.serialize($jsonData))">$label</button>
163	163	#end
164	164
165		-#macro (moreActionsButton $extensionId)
166		- #set ($licensingConfigDoc = $xwiki.getDocument('Licenses.Code.LicensingConfig'))
167		- #set ($autoUpgradesObj = $licensingConfigDoc.getObject('Licenses.Code.AutomaticUpgradesClass'))
168		- #set ($isAutoUpgrade = !$autoUpgradesObj.getValue('blocklist').contains($extensionId))
169		- <div class="btn-group">
170		- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"
171		- title="$services.localization.render("licensor.moreActions")" role="button">
172		- <span class="fa fa-ellipsis-v"></span>
173		- </a>
174		- <ul class="dropdown-menu dropdown-left">
175		- <li class="dropdown-header">
176		- <form target="_blank" class="xform half">
177		- <input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.token)" />
178		- <input type="hidden" name="extensionId" value="$extensionId" />
179		- <input type="checkbox" name="autoUpgrade" #if (!$isAutoUpgrade) checked #end />
180		- <label for="autoUpgrade">
181		- $services.localization.render("licensor.moreActions.autoUpgrade.block")
182		- </label>
183		- </form>
184		- </li>
185		- </ul>
186		- </div>
187		-#end
188		-
189	189	#macro (getLicenseActions $license $extension $actions)
190	190	## Use the JSON format in order to be parsable in JavaScript.
191	191	#set ($jsonData = {
...	...	@@ -205,7 +205,6 @@
205	205	#elseif ($license.type == 'PAID')
206	206	#set ($discard = $actions.add("#licenseButton('PAID' 'success' 'extendPaid' $jsonData)"))
207	207	#end
208		- #set ($discard = $actions.add("#moreActionsButton($jsonData.featureId)"))
209	209	#end
210	210
211	211	#macro (licenseActions $license $extension)