XWIKI-10980: The "Install new applications" button doesn't work anymore.

c576d0f0 · Guillaume Delhumeau · 67306613 · c576d0f0 · c576d0f0
Commit c576d0f0 authored 10 years ago by Guillaume Delhumeau
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/src/main/resources/XWiki/AddExtensions.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/src/main/resources/XWiki/AddExtensions.xml
@@ -282,7 +282,8 @@
    </property>
    <property>
      <parameters>label=$services.localization.render('extensions.applicationsPanel.install')
-target=XWiki.XWikiPreferences||queryString="editor=globaladmin&amp;section=XWiki.AddExtensions"
+target=XWiki.XWikiPreferences
+targetQueryString=editor=globaladmin&amp;section=XWiki.AddExtensions
 icon=icon:bullet_go</parameters>
    </property>
    <property>

--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Applications.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Applications.xml
@@ -138,7 +138,7 @@
      #else
        #set($icon = $services.rendering.render($services.rendering.parse("image:${params.icon}", 'xwiki/2.1'), 'xhtml/1.0'))
      #end
-      &lt;li&gt;&lt;a href="$xwiki.getURL($params.target)"&gt;&lt;span class="application-img"&gt;$icon &lt;/span&gt; &lt;span class="application-label"&gt;$params.label&lt;/a&gt;&lt;/li&gt;
+      &lt;li&gt;&lt;a href="$xwiki.getURL($params.target, 'view', "$!params.targetQueryString")"&gt;&lt;span class="application-img"&gt;$icon &lt;/span&gt; &lt;span class="application-label"&gt;$params.label&lt;/a&gt;&lt;/li&gt;
    #end
  #end
 &lt;/ul&gt;
@@ -155,7 +155,7 @@
          #else
            #set($icon = $services.rendering.render($services.rendering.parse("image:${params.icon}", 'xwiki/2.1'), 'xhtml/1.0'))
          #end
-          &lt;li&gt;&lt;a href="$xwiki.getURL($params.target)"&gt;&lt;span class="application-img"&gt;$icon &lt;/span&gt; &lt;span class="application-label"&gt;$params.label&lt;/a&gt;&lt;/li&gt;
+          &lt;li&gt;&lt;a href="$xwiki.getURL($params.target, 'view', "$!params.targetQueryString")"&gt;&lt;span class="application-img"&gt;$icon &lt;/span&gt; &lt;span class="application-label"&gt;$params.label&lt;/a&gt;&lt;/li&gt;
        #end
      #end
    &lt;/ul&gt;