[JENKINS-31162] Support for Item categorization in Jenkins 2

Originally-Committed-As: e99d4bc50b04553d14c209fe670228a6f435b196
jenkinsci · Apr 4, 2016 · e8cad22 · e8cad22
1 parent 9b098c6
commit e8cad22
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java
@@ -597,6 +597,39 @@ public static void alias() {
             return new WorkflowJob(parent, name);
         }
 
+        /**
+         * Needed if it wants Pipeline jobs are categorized in Jenkins 2.x.
+         *
+         * TODO: Override when the baseline is upgraded to 2.x
+         *
+         * @return A string it represents a ItemCategory identifier.
+         */
+        public String getCategoryId() {
+            return "standaloneprojects";
+        }
+
+        /**
+         * Needed if it wants Pipeline jobs are categorized in Jenkins 2.x.
+         *
+         * TODO: Override when the baseline is upgraded to 2.x
+         *
+         * @return A string with the Item description.
+         */
+        public String getDescription() {
+            return Messages.WorkflowJob_Description();
+        }
+
+        /**
+         * Needed if it wants Pipeline jobs are categorized in Jenkins 2.x.
+         *
+         * TODO: Override when the baseline is upgraded to 2.x
+         *
+         * @return A string it represents a URL pattern to get the Item icon in different sizes.
+         */
+        public String getIconFilePathPattern() {
+            return "plugin/workflow-job/images/:size/pipelinejob.png";
+        }
+
         /** TODO JENKINS-20020 can delete this in case {@code f:dropdownDescriptorSelector} defaults to applying {@code h.filterDescriptors} */
         @Restricted(DoNotUse.class) // Jelly
         public Collection<FlowDefinitionDescriptor> getDefinitionDescriptors(WorkflowJob context) {

diff --git a/job/src/main/resources/org/jenkinsci/plugins/workflow/job/Messages.properties b/job/src/main/resources/org/jenkinsci/plugins/workflow/job/Messages.properties
@@ -1,2 +1,6 @@
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} is already in progress{1}
-BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+
+WorkflowJob.Description=Orchestrates long-running activities that can span multiple build slaves. Suitable for \
+  building pipelines (formerly known as workflows) and/or organizing complex activities that do not easily fit in \
+  free-style job type.
diff --git a/...src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/newInstanceDetail.jelly b/...src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/newInstanceDetail.jelly
@@ -25,7 +25,5 @@
   -->
 
 <j:jelly xmlns:j="jelly:core">
-    Orchestrates long-running activities that can span multiple build slaves. Suitable for
-    building pipelines (formerly known as workflows) and/or organizing complex activities that do not easily fit
-    in free-style job type.
+  ${it.description}
 </j:jelly>
diff --git a/job/src/main/webapp/images/48x48/pipelinejob.png b/job/src/main/webapp/images/48x48/pipelinejob.png