← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy-proposed

« back to all changes in this revision

Viewing changes to core/src/main/resources/hudson/PluginManager/installed.jelly

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/resources/hudson/PluginManager/installed.jelly
42
42
            <tr style="border-top: 0px;">
43
43
              <th width="32" tooltip="${%Uncheck to disable the plugin}">${%Enabled}</th>
44
44
              <th initialSortDir="down">${%Name}</th>
45
 
              <th width="32">${%Version}</th>
46
 
              <th width="32">${%Previously installed version}</th>
47
 
              <th width="32">${%Pinned}</th>
 
45
              <th width="1">${%Version}</th>
 
46
              <th width="1">${%Previously installed version}</th>
 
47
              <th width="1">${%Pinned}</th>
 
48
              <th width="1">${%Uninstall}</th>
48
49
            </tr>
49
50
            <j:forEach var="p" items="${app.pluginManager.plugins}">
50
51
              <tr>
67
68
                    </j:if>
68
69
                  </div>
69
70
                </td>
70
 
                <td class="center pane" style="white-space:nowrap">
 
71
                <td class="center pane" style="white-space:normal">
71
72
                  <a href="plugin/${p.shortName}/thirdPartyLicenses">
72
73
                    ${p.version}
73
74
                  </a>
82
83
                <td class="center pane" id='unpin-${p.shortName}'>
83
84
                  <j:if test="${p.isPinned()}">
84
85
                    <input type="button" onclick="unpin(this,'${p.shortName}')" value="${%Unpin}" class="yui-button" />
85
 
                    <a href="${%wiki.url}"><img style="vertical-align:top" src="${imagesURL}/16x16/help.png"/></a>
 
86
                    <a href="${%wiki.url}" target="_blank"><img style="vertical-align:top" src="${imagesURL}/16x16/help.png"/></a>
86
87
                  </j:if>
87
88
                </td>
 
89
                <td class="center pane">
 
90
                  <j:choose>
 
91
                    <j:when test="${p.isDeleted()}">
 
92
                      <p>${%Uninstallation pending}</p>
 
93
                    </j:when>
 
94
                    <j:when test="${!p.isBundled()}">
 
95
                      <form method="post" action="plugin/${p.shortName}/uninstall">
 
96
                        <input type="submit" value="${%Uninstall}"/>
 
97
                      </form>
 
98
                    </j:when>
 
99
                  </j:choose>
 
100
                </td>
88
101
              </tr>
89
102
            </j:forEach>
90
103
            <!-- failed ones -->
121
134
 
122
135
          <!-- trigger -->
123
136
          new Ajax.Request(btn.getAttribute('url')+"/make"+(btn.checked?"Enable":"Disable")+"d", {
 
137
            method: "POST",
124
138
            onFailure : function(req,o) {
125
139
              $('needRestart').innerHTML = req.responseText;
126
140
            }
135
149
            return String(e.checked)!=e.getAttribute('original');
136
150
          });
137
151
 
138
 
          <j:if test="${it.isPluginUploaded()}">
 
152
          <j:if test="${app.updateCenter.isRestartRequiredForCompletion()}">
139
153
            e = true;
140
154
          </j:if>
141
155
          $('needRestart').style.display = (e!=null?"block":"none");
145
159
 
146
160
        function unpin(button,shortName) {
147
161
          new Ajax.Request("./plugin/"+shortName+"/unpin", {
 
162
            method: "POST",
148
163
            onFailure : function(t) {
149
164
              alert('Failed to unpin:'+t.responseText);
150
165
            },