fix merge error

jenkinsci · Dec 29, 2022 · 9da3988 · 9da3988
1 parent ee3f660
commit 9da3988
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/...ain/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java b/...ain/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java
@@ -78,6 +78,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.acegisecurity.acls.sid.PrincipalSid;
+import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.rolestrategy.permissions.PermissionHelper;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
@@ -439,7 +440,7 @@ public void doRemoveRoles(@QueryParameter(required = true) String type, @QueryPa
    * @param sid      user ID (single, no list)
    * @throws IOException in case saving changes fails
    * @since 2.5.0
-   * @deprecated Use {@link doAssignUserRole} or {@link doAssignGroupRole} to create unambiguous entries
+   * @deprecated Use {@link #doAssignUserRole} or {@link #doAssignGroupRole} to create unambiguous entries
    */
   @Deprecated
   @RequirePOST

diff --git a/.../com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-agent-roles.jelly b/.../com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-agent-roles.jelly
@@ -104,11 +104,7 @@
 
       var agentTableHighlighter
       Event.observe(window, 'load', function(event) {
-<<<<<<< HEAD
-         agentTableHighlighter = new TableHighlighter('agentRoles', 0);
-=======
-        agentTableHighlighter = new TableHighlighter('${tableid}', 0, 1);
->>>>>>> 19f471c (cleanup and move javascript from jelly to js file)
+        agentTableHighlighter = new TableHighlighter('${tableid}', 0);
       });
 
     </script>

diff --git a/...com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-global-roles.jelly b/...com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-global-roles.jelly
@@ -121,11 +121,7 @@
       var globalTableHighlighter;
 
       Event.observe(window, 'load', function(event) {
-<<<<<<< HEAD
-         globalTableHighlighter = new TableHighlighter('globalRoles', 0);
-=======
-         globalTableHighlighter = new TableHighlighter('${tableid}', 0, 1);
->>>>>>> 19f471c (cleanup and move javascript from jelly to js file)
+         globalTableHighlighter = new TableHighlighter('${tableid}', 0);
       });
 
     </script>

diff --git a/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-project-roles.jelly b/...om/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-project-roles.jelly
@@ -121,11 +121,7 @@
       var itemTableHighlighter;
 
       Event.observe(window, 'load', function(event) {
-<<<<<<< HEAD
-         itemTableHighlighter = new TableHighlighter('projectRoles', 0);
-=======
-         itemTableHighlighter = new TableHighlighter('${tableid}', 0, 1);
->>>>>>> 19f471c (cleanup and move javascript from jelly to js file)
+         itemTableHighlighter = new TableHighlighter('${tableid}', 0);
       });
 
     </script>