Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sticky sidepanel #327

Merged
merged 3 commits into from
May 4, 2024
Merged

sticky sidepanel #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11ffa49
sticky sidepanel
mawinter69 Aug 10, 2023
7cd0607
Merge branch 'master' into sticky-sidepanel
mawinter69 May 4, 2024
cf2b657
set sticky param
mawinter69 May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.78</version>
<version>4.81</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -49,8 +49,9 @@
</scm>

<properties>
<jenkins.base>2.440</jenkins.base>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ is still recommending 2.440.1 over 2.440.3, at least until 2.451.1 is released on May 15.

<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.426.3</jenkins.version>
<jenkins.version>${jenkins.base}.3</jenkins.version>
<checkstyle.version>10.13.0</checkstyle.version>
<hpi.compatibleSinceVersion>640</hpi.compatibleSinceVersion>
</properties>
Expand All @@ -59,8 +60,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.426.x</artifactId>
<version>2839.v003b_4d9d24fd</version>
<artifactId>bom-${jenkins.base}.x</artifactId>
<version>3010.vec758b_8e7da_3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,6 @@
}

for (Map.Entry<String, JSONObject> r : (Set<Map.Entry<String, JSONObject>>) roles.getJSONObject("data").entrySet()) {
Set<Permission> permissions = new HashSet<>();
String pattern = ".*";
if (r.getValue().has("pattern")) {
pattern = r.getValue().getString("pattern");
Expand All @@ -1418,6 +1417,7 @@
templateName = r.getValue().getString("templateName");
r.getValue().remove("templateName");
}
Set<Permission> permissions = new HashSet<>();

Check warning on line 1420 in src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 1420 is not covered by tests
for (Map.Entry<String, Boolean> e : (Set<Map.Entry<String, Boolean>>) r.getValue().entrySet()) {
if (e.getValue()) {
Permission p = Permission.fromId(e.getKey());
Expand Down
2 changes: 1 addition & 1 deletion ...resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/sidepanel.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
-->
<?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" xmlns:i="jelly:fmt">
<l:side-panel>
<l:side-panel sticky="true">
<l:tasks>
<l:task href="${rootURL}/manage/role-strategy/" icon="symbol-finger-print-outline plugin-ionicons-api" title="${%Manage Roles}"/>
<l:task href="${rootURL}/manage/role-strategy/assign-roles" icon="symbol-people-outline plugin-ionicons-api" title="${%Assign Roles}"/>
Expand Down