The Unified and Autonomous Development Platform
fix issue #91: Inaccessible jobs are displayed at commit page and various commit status menu
Robin Shen196fbf31192e
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.htmlindex 07c11aaddd..204f826bca 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html@@ -8,8 +8,11 @@<a wicket:id="showInList" class="show-in-list" title="Show in build list"><i class="fa fa-list-ul"></i></a><a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a></div>- <div wicket:id="detail" class="body"></div>+ <div class="body">+ <div wicket:id="detail"></div>+ </div></div>+ <div wicket:id="note" class="note"><i class="fa fa-info-circle"></i> Some jobs are hidden due to permission policy</div></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex 3d29789608..05eee32073 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -35,6 +35,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;@@ -51,13 +52,13 @@ public abstract class CommitStatusPanel extends Panel {private final ObjectId commitId;- private final IModel<List<Job>> jobsModel = new LoadableDetachableModel<List<Job>>() {+ private final IModel<List<Job>> allJobsModel = new LoadableDetachableModel<List<Job>>() {@Overrideprotected List<Job> load() {try {BuildSpec buildSpec = getProject().getBuildSpec(commitId);- if (buildSpec != null)+ if (buildSpec != null)return buildSpec.getJobs();} catch (Exception e) {logger.error("Error retrieving build spec (project: {}, commit: {})",@@ -68,6 +69,20 @@ public abstract class CommitStatusPanel extends Panel {};+ private final IModel<List<Job>> accessibleJobsModel = new LoadableDetachableModel<List<Job>>() {++ @Override+ protected List<Job> load() {+ List<Job> jobs = new ArrayList<>();+ for (Job job: allJobsModel.getObject()) {+ if (SecurityUtils.canAccess(getProject(), job.getName()))+ jobs.add(job);+ }+ return jobs;+ }++ };+private IModel<Status> statusModel = new LoadableDetachableModel<Status>() {@Override@@ -94,9 +109,19 @@ public abstract class CommitStatusPanel extends Panel {protected Component newContent(String id, FloatingPanel dropdown) {Fragment fragment = new Fragment(id, "detailFrag", CommitStatusPanel.this);+ fragment.add(new WebMarkupContainer("note") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(accessibleJobsModel.getObject().size() != allJobsModel.getObject().size());+ }++ });+RepeatingView jobsView = new RepeatingView("jobs");fragment.add(jobsView);- for (Job job: jobsModel.getObject()) {+ for (Job job: accessibleJobsModel.getObject()) {WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());Status status = getProject().getCommitStatus(commitId).get(job.getName());@@ -211,7 +236,8 @@ public abstract class CommitStatusPanel extends Panel {@Overrideprotected void onDetach() {- jobsModel.detach();+ allJobsModel.detach();+ accessibleJobsModel.detach();statusModel.detach();super.onDetach();}@@ -219,7 +245,7 @@ public abstract class CommitStatusPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!jobsModel.getObject().isEmpty());+ setVisible(!allJobsModel.getObject().isEmpty());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css b/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.cssindex 447ba66893..fa8306d3b2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css@@ -4,6 +4,10 @@.commit-status-detail {padding: 12px;}+.commit-status-detail>.note {+ font-size: 12px;+ color: #666;+}.commit-status-detail>.job {margin-bottom: 8px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 0e94b9f869..130f8d4ef6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -267,15 +267,20 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {@Overrideprotected List<Job> load() {+ List<Job> jobs = new ArrayList<>();try {BuildSpec buildSpec = getProject().getBuildSpec(getCommit().copy());- if (buildSpec != null)- return buildSpec.getJobs();+ if (buildSpec != null) {+ for (Job job: buildSpec.getJobs()) {+ if (SecurityUtils.canAccess(getProject(), job.getName()))+ jobs.add(job);+ }+ }} catch (Exception e) {logger.error("Error retrieving build spec (project: {}, commit: {})",getProject().getName(), getCommit().name(), e);}- return new ArrayList<>();+ return jobs;}}) {