[JENKINS-39300] View.getDisplayName() is ignored when rendering tabs

core/src/main/java/hudson/model/AllView.java

@@ -64,6 +64,11 @@ public boolean contains(TopLevelItem item) {
         return true;
     }
 
+    @Override
+    public String getDisplayName() {
+        return Messages.Hudson_ViewName();
+    }
+
     @RequirePOST
     @Override
     public Item doCreateItem(StaplerRequest req, StaplerResponse rsp)
@@ -92,10 +97,12 @@ protected void submit(StaplerRequest req) throws IOException, ServletException,
     @Extension @Symbol("all")
     public static final class DescriptorImpl extends ViewDescriptor {
         @Override
-        public boolean isInstantiable() {
-            for (View v : Stapler.getCurrentRequest().findAncestorObject(ViewGroup.class).getViews())
-                if(v instanceof AllView)
+        public boolean isApplicableIn(ViewGroup owner) {
+            for (View v : owner.getViews()) {
+                if (v instanceof AllView) {
                     return false;
+                }
+            }
             return true;
         }
 

core/src/main/java/hudson/model/ListView.java

@@ -141,7 +141,9 @@ private Object readResolve() {
 
     protected void initColumns() {
         if (columns == null)
-            columns = new DescribableList<ListViewColumn, Descriptor<ListViewColumn>>(this,ListViewColumn.createDefaultInitialColumnList());
+            columns = new DescribableList<ListViewColumn, Descriptor<ListViewColumn>>(this,
+                    ListViewColumn.createDefaultInitialColumnList(getClass())
+            );
     }
 
     protected void initJobFilters() {
@@ -459,7 +461,7 @@ public FormValidation doCheckIncludeRegex( @QueryParameter String value ) throws
      */
     @Deprecated
     public static List<ListViewColumn> getDefaultColumns() {
-        return ListViewColumn.createDefaultInitialColumnList();
+        return ListViewColumn.createDefaultInitialColumnList(ListView.class);
     }
 
     @Restricted(NoExternalUse.class)

core/src/main/java/hudson/model/View.java

@@ -415,7 +415,7 @@ public List<Widget> getWidgets() {
      * If this view uses &lt;t:projectView> for rendering, this method returns columns to be displayed.
      */
     public Iterable<? extends ListViewColumn> getColumns() {
-        return ListViewColumn.createDefaultInitialColumnList();
+        return ListViewColumn.createDefaultInitialColumnList(this);
     }
 
     /**
@@ -1219,11 +1219,20 @@ public static DescriptorExtensionList<View,ViewDescriptor> all() {
         return Jenkins.getInstance().<View,ViewDescriptor>getDescriptorList(View.class);
     }
 
+    /**
+     * Returns the {@link ViewDescriptor} instances that can be instantiated for the {@link ViewGroup} in the current
+     * {@link StaplerRequest}. <strong>NOTE: This method must be called from a {@link StaplerRequest}</strong>
+     * @return the list of instantiable {@link ViewDescriptor} instances for the current {@link StaplerRequest}
+     */
     public static List<ViewDescriptor> allInstantiable() {
         List<ViewDescriptor> r = new ArrayList<ViewDescriptor>();
-        for (ViewDescriptor d : all())
-            if(d.isInstantiable())
+        ViewGroup owner = Stapler.getCurrentRequest().findAncestorObject(ViewGroup.class);
+        for (ViewDescriptor d : DescriptorVisibilityFilter.apply(owner, all())) {
+            if (d.isApplicableIn(owner) && d.isInstantiable()
+                    && owner.getACL().hasCreatePermission(Jenkins.getAuthentication(), owner, d)) {
                 r.add(d);
+            }
+        }
         return r;
     }
 
@@ -1268,6 +1277,9 @@ public static View create(StaplerRequest req, StaplerResponse rsp, ViewGroup own
         if (mode==null || mode.length()==0) {
             if(isXmlSubmission) {
                 View v = createViewFromXML(name, req.getInputStream());
+                if (!owner.getACL().hasCreatePermission(Jenkins.getAuthentication(), owner, v.getDescriptor())) {
+                    throw new Failure(Messages.View_CreatePermissionMissing(v.getDescriptor().getDisplayName()));
+                }
                 v.owner = owner;
                 rsp.setStatus(HttpServletResponse.SC_OK);
                 return v;
@@ -1276,7 +1288,7 @@ public static View create(StaplerRequest req, StaplerResponse rsp, ViewGroup own
         }
 
         View v;
-        if (mode!=null && mode.equals("copy")) {
+        if ("copy".equals(mode)) {
             v = copy(req, owner, name);
         } else {
             ViewDescriptor descriptor = all().findByName(mode);
@@ -1287,6 +1299,9 @@ public static View create(StaplerRequest req, StaplerResponse rsp, ViewGroup own
             // create a view
             v = descriptor.newInstance(req,req.getSubmittedForm());
         }
+        if (!owner.getACL().hasCreatePermission(Jenkins.getAuthentication(), owner, v.getDescriptor())) {
+            throw new Failure(Messages.View_CreatePermissionMissing(v.getDescriptor().getDisplayName()));
+        }
         v.owner = owner;
 
         // redirect to the config screen

core/src/main/java/hudson/model/ViewDescriptor.java

@@ -23,17 +23,26 @@
  */
 package hudson.model;
 
+import hudson.util.FormValidation;
 import hudson.views.ListViewColumn;
 import hudson.views.ListViewColumnDescriptor;
 import hudson.views.ViewJobFilter;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.Iterator;
 import java.util.List;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import jenkins.model.DirectlyModifiableTopLevelItemGroup;
 import jenkins.model.Jenkins;
+import org.apache.commons.lang.StringUtils;
+import org.jvnet.tiger_types.Types;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.QueryParameter;
+import org.kohsuke.stapler.Stapler;
+import org.kohsuke.stapler.StaplerRequest;
 
 /**
  * {@link Descriptor} for {@link View}.
@@ -101,13 +110,65 @@ public AutoCompletionCandidates doAutoCompleteCopyNewItemFrom(@QueryParameter fi
      * Possible {@link ListViewColumnDescriptor}s that can be used with this view.
      */
     public List<Descriptor<ListViewColumn>> getColumnsDescriptors() {
-        return ListViewColumn.all();
+        StaplerRequest request = Stapler.getCurrentRequest();
+        View view = request.findAncestorObject(clazz);
+        return view == null ? DescriptorVisibilityFilter.applyType(clazz, ListViewColumn.all())
+                : DescriptorVisibilityFilter.apply(view, ListViewColumn.all());
     }
 
     /**
      * Possible {@link ViewJobFilter} types that can be used with this view.
      */
     public List<Descriptor<ViewJobFilter>> getJobFiltersDescriptors() {
-        return ViewJobFilter.all();
+        StaplerRequest request = Stapler.getCurrentRequest();
+        View view = request.findAncestorObject(clazz);
+        return view == null ? DescriptorVisibilityFilter.applyType(clazz, ViewJobFilter.all())
+                : DescriptorVisibilityFilter.apply(view, ViewJobFilter.all());
     }
+
+    /**
+     * Validation of the display name field.
+     *
+     * @param view the view to check the new display name of.
+     * @param value the proposed new display name.
+     * @return the validation result.
+     * @since FIXME
+     */
+    @SuppressWarnings("unused") // expose utility check method to subclasses
+    protected FormValidation checkDisplayName(@Nonnull View view, @CheckForNull String value) {
+        if (StringUtils.isBlank(value)) {
+            // no custom name, no need to check
+            return FormValidation.ok();
+        }
+        for (View v: view.owner.getViews()) {
+            if (v.getViewName().equals(view.getViewName())) {
+                continue;
+            }
+            if (StringUtils.equals(v.getDisplayName(), value)) {
+                return FormValidation.warning(Messages.View_DisplayNameNotUniqueWarning(value));
+            }
+        }
+        return FormValidation.ok();
+    }
+
+    /**
+     * Returns true if this {@link View} type is applicable to the given {@link ViewGroup} type.
+     *
+     * @return true to indicate applicable, in which case the view will be instantiable within the type of owner.
+     * @since FIXME
+     */
+    public boolean isApplicable(Class<? extends ViewGroup> ownerType) {
+        return true;
+    }
+
+    /**
+     * Returns true if this {@link View} type is applicable in the specific {@link ViewGroup}.
+     *
+     * @return true to indicate applicable, in which case the view will be instantiable within the given owner.
+     * @since FIXME
+     */
+    public boolean isApplicableIn(ViewGroup owner) {
+        return isApplicable(owner.getClass());
+    }
+
 }

core/src/main/java/hudson/security/ACL.java

@@ -24,6 +24,8 @@
 package hudson.security;
 
 import hudson.model.User;
+import hudson.model.ViewDescriptor;
+import hudson.model.ViewGroup;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
@@ -120,6 +122,23 @@ public boolean hasCreatePermission(@Nonnull Authentication a, @Nonnull ItemGroup
         return true;
     }
 
+    /**
+     * Checks if the given principal has the permission to create views within the specified view group.
+     * <p>
+     * Note that {@link #SYSTEM} can be passed in as the authentication parameter,
+     * in which case you should probably just assume it can create anything anywhere.
+     * @param a the principal.
+     * @param c the container of the view.
+     * @param d the descriptor of the view to be created.
+     * @return false
+     *      if the user doesn't have the permission.
+     * @since FIXME
+     */
+    public boolean hasCreatePermission(@Nonnull Authentication a, @Nonnull ViewGroup c,
+                                       @Nonnull ViewDescriptor d) {
+        return true;
+    }
+
     //
     // Sid constants
     //

core/src/main/java/hudson/views/ListViewColumn.java

@@ -29,6 +29,7 @@
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.Descriptor.FormException;
+import hudson.model.DescriptorVisibilityFilter;
 import jenkins.model.Jenkins;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
@@ -121,20 +122,50 @@ public Descriptor<ListViewColumn> getDescriptor() {
     /**
      * Creates the list of {@link ListViewColumn}s to be used for newly created {@link ListView}s and their likes.
      * @since 1.391
+     * @deprecated use {@link #createDefaultInitialColumnList(Class)}
      */
+    @Deprecated
     public static List<ListViewColumn> createDefaultInitialColumnList() {
+        return createDefaultInitialColumnList(ListViewColumn.all());
+    }
+
+    /**
+     * Creates the list of {@link ListViewColumn}s to be used for newly created {@link ListView}s and their likes.
+     *
+     * @see ListView#initColumns()
+     * @since FIXME
+     */
+    public static List<ListViewColumn> createDefaultInitialColumnList(Class<? extends View> context) {
+        return createDefaultInitialColumnList(DescriptorVisibilityFilter.applyType(context, ListViewColumn.all()));
+    }
+
+    /**
+     * Creates the list of {@link ListViewColumn}s to be used for a {@link ListView}s and their likes.
+     *
+     * @see View#getColumns()
+     * @since FIXME
+     */
+    public static List<ListViewColumn> createDefaultInitialColumnList(View view) {
+        return createDefaultInitialColumnList(DescriptorVisibilityFilter.apply(view, ListViewColumn.all()));
+    }
+
+    private static List<ListViewColumn> createDefaultInitialColumnList(List<Descriptor<ListViewColumn>> descriptors) {
         // OK, set up default list of columns:
         // create all instances
         ArrayList<ListViewColumn> r = new ArrayList<ListViewColumn>();
         final JSONObject emptyJSON = new JSONObject();
-        for (Descriptor<ListViewColumn> d : ListViewColumn.all())
+        for (Descriptor<ListViewColumn> d : descriptors)
             try {
                 if (d instanceof ListViewColumnDescriptor) {
                     ListViewColumnDescriptor ld = (ListViewColumnDescriptor) d;
-                    if (!ld.shownByDefault())       continue;   // skip this
+                    if (!ld.shownByDefault()) {
+                        continue;   // skip this
+                    }
                 }
                 ListViewColumn lvc = d.newInstance(null, emptyJSON);
-                if (!lvc.shownByDefault())      continue; // skip this
+                if (!lvc.shownByDefault()) {
+                    continue; // skip this
+                }
 
                 r.add(lvc);
             } catch (FormException e) {

core/src/main/java/jenkins/model/Jenkins.java

@@ -3052,7 +3052,7 @@ public void run(Reactor session) throws Exception {
                 // initialize views by inserting the default view if necessary
                 // this is both for clean Jenkins and for backward compatibility.
                 if(views.size()==0 || primaryView==null) {
-                    View v = new AllView(Messages.Hudson_ViewName());
+                    View v = new AllView("all");
                     setViewOwner(v);
                     views.add(0,v);
                     primaryView = v.getViewName();

core/src/main/resources/hudson/model/Messages.properties

@@ -261,6 +261,9 @@ View.ConfigurePermission.Description=\
 View.ReadPermission.Description=\
   This permission allows users to see views (implied by generic read access).
 View.MissingMode=No view type is specified
+View.DisplayNameNotUniqueWarning=The display name, "{0}", is already in use by another view and \
+  could cause confusion and delay.
+View.CreatePermissionMissing=You are not permitted to create a {0} view
 
 UpdateCenter.Status.CheckingInternet=Checking internet connectivity
 UpdateCenter.Status.CheckingJavaNet=Checking update center connectivity

core/src/main/resources/hudson/model/MyViewsProperty/newView.jelly

@@ -32,7 +32,7 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" it="${it.user}"/>
 
     <l:main-panel>
-      <j:invokeStatic var="views" className="hudson.model.View" method="allInstantiable" />
+      <j:invokeStatic var="views" className="hudson.model.View" method="allInstantiable"/>
       <n:form nameTitle="${%View name}" action="createView"
               descriptors="${views}" checkUrl="${rootURL}/${it.url}viewExistsCheck" xmlns:n="/lib/hudson/newFromList" />
     </l:main-panel>

core/src/main/resources/hudson/views/DefaultMyViewsTabBar/myViewTabs.jelly

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <!-- view tab bar -->
   <l:tabBar>
     <j:forEach var="v" items="${views}">
-      <l:tab name="${v.viewName}" active="${v==currentView}" href="${rootURL}/${v.url}" />
+      <l:tab name="${v.displayName}" active="${v==currentView}" href="${rootURL}/${v.url}" />
     </j:forEach>
     <j:if test="${currentView.hasPermission(currentView.CREATE)}">
       <l:tab name="+" href="${rootURL}/${currentView.owner.url}newView" active="false"

core/src/main/resources/hudson/views/DefaultViewsTabBar/viewTabs.jelly

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <!-- view tab bar -->
   <l:tabBar>
     <j:forEach var="v" items="${views}">
-      <l:tab name="${v.viewName}" active="${v==currentView}" href="${rootURL}/${v.url}" />
+      <l:tab name="${v.displayName}" active="${v==currentView}" href="${rootURL}/${v.url}" />
     </j:forEach>
     <j:if test="${currentView.hasPermission(currentView.CREATE)}">
       <l:tab name="+" href="${rootURL}/${currentView.owner.url}newView" active="false"

core/src/main/resources/jenkins/model/Jenkins/newView.jelly

@@ -31,7 +31,7 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
 
     <l:main-panel>
-      <j:invokeStatic var="views" className="hudson.model.View" method="allInstantiable" />
+      <j:invokeStatic var="views" className="hudson.model.View" method="allInstantiable"/>
       <n:form nameTitle="${%View name}" action="createView" copyTitle="${%Copy Existing View}"
               descriptors="${views}" checkUrl="checkViewName" xmlns:n="/lib/hudson/newFromList" />
     </l:main-panel>

core/src/main/resources/lib/layout/tab.jelly

@@ -22,24 +22,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-<%@ attribute name="name" required="true" type="java.lang.String" %>
-<%@ attribute name="href" required="true" type="java.lang.String" %>
-<%@ attribute name="active" required="true" type="java.lang.Boolean" %>
-<%@ attribute name="title" required="false" type="java.lang.String" %>
--->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-  <div class="tab${active?' active':''}">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+  <st:documentation>
+    <st:attribute name="name" use="required">
+      The name of the tab
+    </st:attribute>
+    <st:attribute name="href" use="required">
+      The url of the tab
+    </st:attribute>
+    <st:attribute name="active" type="java.lang.Boolean">
+      Whether the tab is active or not
+    </st:attribute>
+    <st:attribute name="title">
+      The title of the tab
+    </st:attribute>
+  </st:documentation>
+  <div class="tab${attrs.active?' active':''}">
     <j:choose>
-      <j:when test="${active}">
+      <j:when test="${attrs.active}">
         <input type="radio" id="tab-${tabBarId}-${tabIndex}" name="tab-group-${tabBarId}" checked="checked" />
       </j:when>
       <j:otherwise>
         <input type="radio" id="tab-${tabBarId}-${tabIndex}" name="tab-group-${tabBarId}" />
       </j:otherwise>
     </j:choose>
-    <a href="${href}" class="${name.equals('+')?'addTab':''}">${name}</a>
+    <a href="${href}" class="${name.equals('+')?'addTab':''}" title="${attrs.title}">${attrs.name}</a>
   </div>
   <j:set scope="parent" var="tabIndex" value="${tabIndex+1}" />
 </j:jelly>