Merge pull request #79 from TobiX/rm-display-mode

Remove displayMode setting (fixes #78)
jenkinsci · Jan 9, 2024 · 11eb5fa · 11eb5fa
2 parents 3ab4322 + a55570c
commit 11eb5fa
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 58 deletions.
diff --git a/README.adoc b/README.adoc
@@ -55,7 +55,6 @@ nextBuilds:
   filterByView: false
   showPossibleWidget: false
   showParameterizedWidget: false
-  displayMode: 1
 ----
 
 

diff --git a/src/main/java/hudson/plugins/nextexecutions/NextBuilds.java b/src/main/java/hudson/plugins/nextexecutions/NextBuilds.java
@@ -115,7 +115,6 @@ public static class DescriptorImpl extends Descriptor<NextBuilds> {
         private Boolean filterByView;
         private Boolean showPossibleWidget;
         private Boolean showParameterizedWidget;
-        private Integer displayMode;
 
         public DescriptorImpl() {
             load();
@@ -161,17 +160,6 @@ public void setShowParameterizedWidget(boolean showParameterizedWidget) {
             this.showParameterizedWidget = showParameterizedWidget;
         }
 
-        public Integer getDisplayMode() {
-            if (displayMode == null) {
-                return 1;
-            }
-            return displayMode;
-        }
-
-        public void setDisplayMode(Integer displayMode) {
-            this.displayMode = displayMode;
-        }
-
         public String getDefault() {
             return "dd/MM/yyyy HH:mm z";
         }
@@ -186,7 +174,6 @@ public boolean configure(StaplerRequest req, JSONObject json) throws hudson.mode
             filterByView = json.getBoolean("filterByView");
             showPossibleWidget = json.getBoolean("showPossibleWidget");
             showParameterizedWidget = json.getBoolean("showParameterizedWidget");
-            displayMode = json.getInt("displayMode");
             save();
             return true;
         }

diff --git a/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java b/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java
@@ -141,17 +141,6 @@ public boolean showWidget() {
         return true;
     }
 
-    // Default displayMode will be 1
-    public int getDisplayMode() {
-        Jenkins j = Jenkins.getInstanceOrNull();
-        DescriptorImpl d = j != null ? (DescriptorImpl) (j.getDescriptorOrDie(NextBuilds.class)) : null;
-
-        if (d == null) {
-            return 1;
-        }
-        return d.getDisplayMode();
-    }
-
     public boolean getShowParameterizedWidget() {
         Jenkins j = Jenkins.getInstanceOrNull();
         DescriptorImpl d = j != null ? (DescriptorImpl) (j.getDescriptorOrDie(NextBuilds.class)) : null;

diff --git a/src/main/resources/hudson/plugins/nextexecutions/NextBuilds/global.jelly b/src/main/resources/hudson/plugins/nextexecutions/NextBuilds/global.jelly
@@ -13,10 +13,5 @@
     <f:entry title="${%Show Parameterized Next Executions Widget}" field="showParameterizedWidget">
       <f:checkbox />
     </f:entry>
-    <f:entry title="${%Widget Display mode}" help="/plugin/next-executions/displayMode.html">
-       <f:radio name="displayMode" value="1" title="${%Truncate}" checked="${descriptor.displayMode == 1}"/>
-       <f:radio name="displayMode" value="2" title="${%Fixed Width}" checked="${descriptor.displayMode == 2}"/>
-       <f:radio name="displayMode" value="3" title="${%Jenkins}" checked="${descriptor.displayMode == 3}"/>
-    </f:entry>
   </f:section>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly b/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly
@@ -1,26 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <j:if test="${it.showWidget()}">
-  <style>
-  <j:if test="${it.displayMode==1}">
-  	#${it.widgetId} table {
-  		table-layout: fixed;
-  	}
-    #${it.widgetId} td {
-        text-overflow: ellipsis;
-        overflow: hidden;
-    }
-  </j:if>
-  <j:if test="${it.displayMode==2}">
-  	#${it.widgetId} table {
-  		table-layout: fixed;
-  	}
-  	#${it.widgetId} td {
-  		word-wrap: break-word;
-  		white-space: normal;
-  	}
-  </j:if>
-  </style>
   <l:pane width="2" title="${it.widgetName}" id="${it.widgetId}">
     <j:forEach var="w" items="${it.builds}">
       <tr>

diff --git a/src/main/webapp/displayMode.html b/src/main/webapp/displayMode.html