[FIXED JENKINS-18633] Simplified distinction between Jenkins.descript…

…ion and View.description. Both are shown if defined. The edit description link only applies to View.description. Properly handle a ViewGroup other than Jenkins itself, such as a folder. (cherry picked from commit 04c8a1e) Conflicts: changelog.html
jenkinsci · Nov 2, 2013 · 6243958 · 6243958 · jglick · Nov 2, 2013
1 parent 3695e61
commit 6243958
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/core/src/main/java/hudson/model/AllView.java b/core/src/main/java/hudson/model/AllView.java
@@ -23,7 +23,6 @@
  */
 package hudson.model;
 
-import jenkins.model.Jenkins;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
@@ -53,11 +52,6 @@ public AllView(String name, ViewGroup owner) {
         this.owner = owner;
     }
 
-    @Override
-    public String getDescription() {
-        return Jenkins.getInstance().getDescription();
-    }
-
     @Override
     public boolean isEditable() {
         return false;
@@ -82,14 +76,6 @@ public Collection<TopLevelItem> getItems() {
         return (Collection)getOwnerItemGroup().getItems();
     }
 
-    @Override
-    public synchronized void doSubmitDescription( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
-        checkPermission(Jenkins.ADMINISTER);
-
-        Jenkins.getInstance().setSystemMessage(req.getParameter("description"));
-        rsp.sendRedirect(".");
-    }
-
     @Override
     public String getPostConstructLandingPage() {
         return ""; // there's no configuration page

diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-  <j:if test="${it.class.name=='hudson.model.Hudson'}">
+  <j:if test="${it.primaryView != null}">
     <j:set var="it" value="${it.primaryView}"/>
   </j:if>
   <l:ajax>

diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
@@ -31,12 +31,10 @@ THE SOFTWARE.
           <st:include page="view-index-top.jelly" it="${it.owner}" optional="true">
             <!-- allow the owner to take over the top section, but we also need the default to be backward compatible -->
             <div id="view-message">
-              <j:if test="${it.class.name!='hudson.model.AllView'}">
                 <div id="systemmessage">
                   <j:out value="${app.systemMessage!=null ? app.markupFormatter.translate(app.systemMessage) : ''}" />
                 </div>
-              </j:if>            
-              <t:editableDescription permission="${app.ADMINISTER}"/>
+              <t:editableDescription permission="${it.CONFIGURE}"/>
             </div>
           </st:include>