Перейти к содержимому

Изменения документа Расширения

Редактировал(а) Андрей Ганьков 2025/07/06 04:58
От версии 3.1
отредактировано Андрей Ганьков
на 2021/05/26 11:10
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-extension-ui/13.3]
К версии 1.1
отредактировано superadmin
на 2020/10/06 10:51
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-extension-ui/12.8]

Сводка

Подробности

Свойства страницы
Автор документа
... ... @@ -1,1 +1,1 @@
1 -xwiki:XWiki.gav
1 +XWiki.superadmin
Содержимое
... ... @@ -13,14 +13,17 @@
13 13   ## Advanced search.
14 14   #handleExtensionRequest()
15 15   #else
16 - #if ($request.index_start)
17 - #set ($void = $extensionManager.getRepository('index').index("wiki:${xcontext.database}"))
18 - #end
19 19   ## Simple search.
20 20   #set ($noResultsMessageKey = 'extensions.search.noResults')
21 21   #set ($paginationParams = {})
22 22   ## Dump whitespace generated by the pagination macro
23 23   #set ($discard = "#paginationPrepareParams($paginationParams)")
21 + #set ($repository = $extensionManager)
22 + #if ($request.repo)
23 + #set ($selectedRepositoryId = $request.repo)
24 + #elseif (!$selectedRepositoryId)
25 + #set ($selectedRepositoryId = 'recommended')
26 + #end
24 24   #if ("$!selectedRepositoryId" != '')
25 25   #set ($repository = $extensionManager.getRepository($selectedRepositoryId))
26 26   #if ("$!request.search" == '')
... ... @@ -47,7 +47,7 @@
47 47   #end
48 48   #end
49 49   #if (!$extensions)
50 - #set($extensionQuery = $services.extension.index.newQuery("$!request.search"))
53 + #set($extensionQuery = $services.extension.newQuery("$!request.search"))
51 51   #set($void = $extensionQuery.setOffset($paginationParams.firstItem))
52 52   #set($void = $extensionQuery.setLimit($paginationParams.itemsPerPage))
53 53   #if ($selectedRepositoryId == 'installed')
... ... @@ -57,57 +57,31 @@
57 57   ## When searching for installed extensions in a subwiki we need to take the namespace into account.
58 58   #set ($extensions = $services.extension.installed.repository.searchInstalledExtensions($extensionNamespace, $extensionQuery))
59 59   #end
60 - #elseif ($repository)
61 - #set ($extensions = $repository.search($extensionQuery))
62 62   #else
63 - #if ($recommended)
64 - #set($void = $extensionQuery.addFilter('recommended', true, 'EQUAL'))
65 - #end
66 - #if ($indexed)
67 - #set ($repository = $extensionManager.index.repository)
68 - #if ($compatible)
69 - #set ($void = $extensionQuery.setCompatible(true, '', "wiki:$xcontext.database"))
70 - #end
71 - #else
72 - #set ($repository = $extensionManager)
73 - #end
74 - #set ($extensions = $repository.search($extensionQuery))
64 + #set ($extensions = $repository.search("$!request.search", $paginationParams.firstItem, $paginationParams.itemsPerPage))
75 75   #end
76 76   #set ($totalHits = $extensions.totalHits)
77 77   #end
78 -
79 - #if ($recommended)
68 + #if ($selectedRepositoryId == 'recommended')
80 80   #if (!$extensions.iterator().hasNext())
81 - <div class="box warningmessage">$services.localization.render('extensions.search.recommended.fallback', ["<em>$!escapetool.xml($request.search)</em>"])</div>
82 - ## Search again with the recommended filter
70 + <div class="box warningmessage">$services.localization.render('extensions.search.repository.recommended.fallback', ["<em>$!escapetool.xml($request.search)</em>", "<strong>$services.localization.render('extensions.search.repository.remote.label')</strong>"])</div>
71 + ## Fallback to all remote extensions
72 + #set ($repository = $extensionManager)
73 + #set($selectedRepositoryId = '')
83 83   #set ($extensions = $repository.search("$!request.search", $paginationParams.firstItem, $paginationParams.itemsPerPage))
84 - #set ($totalHits = $extensions.totalHits)
85 - #set ($recommended = false)
86 - #elseif (!$customExtensionFilter)
87 - <div class="box infomessage">
88 - #if ($compatible)
89 - $services.localization.render('extensions.search.compatiblerecommended.disclaimer')
90 - #else
91 - $services.localization.render('extensions.search.recommended.disclaimer')
92 - #end
75 + #else
76 + <div class="box infomessage">$services.localization.render('extensions.search.repository.recommended.disclaimer')
93 93   <form action="${xwiki.relativeRequestURL}">
94 94   #if ($request.section)
95 95   <input type="hidden" name="section" value="${escapetool.xml($request.section)}" />
96 96   #end
97 97   <input type="hidden" name="search" value="$!{escapetool.xml($request.search)}" />
98 - <input type="hidden" name="recommended" value="false" />
99 - <input type="hidden" name="indexed" value="$indexed" />
100 - <input type="hidden" name="compatible" value="$compatible" />
101 - #if ($compatible)
102 - <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.compatible.all.label'))}" class="btn btn-default"/>
103 - #else
104 - <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.all.label'))}" class="btn btn-default"/>
105 - #end
82 + <input type="hidden" name="repo" value="" />
83 + <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.repository.remote.label'))}" class="button secondary"/>
106 106   </form>
107 107   </div>
108 108   #end
109 109   #end
110 -
111 111   #if (!$extensions.iterator().hasNext())
112 112   <div class="box infomessage">$services.localization.render($noResultsMessageKey, ["<em>$!escapetool.xml($request.search)</em>"])</div>
113 113   #else
... ... @@ -125,42 +125,6 @@
125 125   #pagination($paginationParams)
126 126   #end
127 127   #end
128 -
129 - #if ($indexed)
130 - #set ($indexJobStatus = $repository.getStatus("wiki:${xcontext.database}"))
131 - #if ($indexJobStatus)
132 - <div class="box infomessage">
133 - #if ($indexJobStatus.state != 'FINISHED')
134 - $escapetool.xml($services.localization.render('extensions.search.indexed.started', [$xwiki.formatDate($indexJobStatus.startDate)]))
135 - #set ($discard = $xwiki.jsfx.use('uicomponents/job/job.js', true))
136 - #set ($jobStatusURL = $doc.getURL('get', $escapetool.url({
137 - 'xpage': 'job_status_json',
138 - 'outputSyntax': 'plain',
139 - 'jobId': $indexJobStatus.request.id
140 - })))
141 - <div class="xcontent job-status" data-url="$escapetool.xml($jobStatusURL)">
142 - #displayJobProgressBar($indexJobStatus, true)
143 - </div>
144 - #else
145 - $escapetool.xml($services.localization.render('extensions.search.indexed.on', [$xwiki.formatDate($indexJobStatus.startDate)]))
146 - #end
147 - #else
148 - <div class="box warningmessage">$escapetool.xml($services.localization.render('extensions.search.indexed.nojob'))
149 - #end
150 - <form action="${xwiki.relativeRequestURL}">
151 - #if ($request.section)
152 - <input type="hidden" name="section" value="${escapetool.xml($request.section)}" />
153 - #end
154 - <input type="hidden" name="search" value="$!{escapetool.xml($request.search)}" />
155 - <input type="hidden" name="recommended" value="$recommended" />
156 - <input type="hidden" name="indexed" value="$indexed" />
157 - <input type="hidden" name="compatible" value="$compatible" />
158 - #if ($indexJobStatus.state != 'RUNNING')
159 - <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.indexed.reindex'))}" name="index_start" class="btn btn-default"/>
160 - #end
161 - </form>
162 - </div>
163 - #end
164 164   #end
165 165   </div>
166 166  #end