From 055b1ce30d0827b03020d347a3be30205e8d6413 Mon Sep 17 00:00:00 2001
From: mindless <mindless@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 8 Jan 2009 21:53:32 +0000
Subject: [PATCH] Fix some bugs from r14215, new master-slave stuff: - Fix
 Status link on (master) node page (was missing parens) - Fix Delete,
 Configure and Build History links on node pages   (pointed to top level
 instead of relative) - Only show New Node link if you have Administer
 permission - Add permission check on computer/new page - Removed broken
 "Configure Executors" link on nodes page   (now each node has its own
 Configure link) - Fix one help link in DumbSlave config page - Fix group
 label for new Slave permissions

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14250 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../main/resources/hudson/model/Computer/sidepanel.jelly  | 8 ++++----
 .../src/main/resources/hudson/model/ComputerSet/new.jelly | 4 ++--
 .../resources/hudson/model/ComputerSet/sidepanel.jelly    | 5 ++---
 core/src/main/resources/hudson/model/Messages.properties  | 2 +-
 .../hudson/slaves/DumbSlave/configure-entries.jelly       | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
index fe2d72865d..f3ddc57824 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
@@ -6,10 +6,10 @@
   <l:side-panel>
     <l:tasks>
       <l:task icon="images/24x24/up.gif" href=".." title="${%Back to List}" />
-      <l:task icon="images/24x24/search.gif" href="${rootURL}/computer/${it.displayName}/" title="${%Status}" />
-      <l:task icon="images/24x24/edit-delete.gif" href="${url}/delete" title="${%Delete Slave}" permission="${it.DELETE}" />
-      <l:task icon="images/24x24/setting.gif" href="${url}/configure" title="${%Configure}" permission="${it.CONFIGURE}" />
-      <l:task icon="images/24x24/notepad.gif" href="${url}/builds" title="${%Build History}" />
+      <l:task icon="images/24x24/search.gif" href="${rootURL}/${it.url}" title="${%Status}" />
+      <l:task icon="images/24x24/edit-delete.gif" href="delete" title="${%Delete Slave}" permission="${it.DELETE}" />
+      <l:task icon="images/24x24/setting.gif" href="configure" title="${%Configure}" permission="${it.CONFIGURE}" />
+      <l:task icon="images/24x24/notepad.gif" href="builds" title="${%Build History}" />
       <l:task icon="images/24x24/monitor.gif" href="load-statistics" title="${%Load Statistics}" />
       <l:task icon="images/24x24/terminal.gif" href="script" title="${%Script Console}" permission="${app.ADMINISTER}" />
       <st:include page="sidepanel2.jelly" optional="true" /><!-- hook for derived class to add more items -->
diff --git a/core/src/main/resources/hudson/model/ComputerSet/new.jelly b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
index 9350520c2f..1aa8ca4238 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/new.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
@@ -6,12 +6,12 @@
     new.jelly -> ComputerSet.doCreateItem -> _new2.jelly -> ComputerSet.doDoCreateItem
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
-	<l:layout norefresh="true">
+  <l:layout norefresh="true" permission="${app.ADMINISTER}">
 		<st:include page="sidepanel.jelly" />
 		<l:main-panel>
       <j:getStatic var="slaves" className="hudson.slaves.NodeDescriptor" field="ALL" />
       <n:form nameTitle="${%Node name}" copyTitle="${%Copy Existing Node}" copyNames="${it._slaveNames}"
               descriptors="${slaves}" xmlns:n="/lib/hudson/newFromList" />
     </l:main-panel>
-	</l:layout>
+  </l:layout>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
index e15cd0135f..9617f9633e 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
@@ -6,10 +6,9 @@
   <l:side-panel>
     <l:tasks>
       <l:task icon="images/24x24/up.gif" href="${rootURL}/" title="${%Back to Dashboard}" />
-      <l:task icon="images/24x24/new-computer.gif" href="new" title="${%New Node}" />
-      <l:task icon="images/24x24/setting.gif" href="${rootURL}/configureExecutors" title="${%Configure Executors}" />
+      <l:task icon="images/24x24/new-computer.gif" href="new" title="${%New Node}" permission="${app.ADMINISTER}" />
     </l:tasks>
     <t:queue items="${app.queue.items}" />
     <t:executors />
   </l:side-panel>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 896d3ee845..7e85a07494 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -32,7 +32,7 @@ BallColor.Success=Success
 BallColor.Unstable=Unstable
 
 Computer.Caption=Slave {0}
-Computer.Permissions.Title=View
+Computer.Permissions.Title=Slave
 Computer.ConfigurePermission.Description=This permission allows users to configure slaves.
 Computer.DeletePermission.Description=This permission allows users to delete existing slaves.
 
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
index 0417cdb02e..9172a660af 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
@@ -25,7 +25,7 @@
   <f:slave-mode name="mode" node="${s}" />
 
   <f:dropdownList name="slave.launcher" title="${%Launch method}"
-                  help="/help/system-config/master-slave/launcher.html">
+                  help="/help/system-config/master-slave/startMethod.html">
     <j:forEach var="d" items="${h.getComputerLauncherDescriptors()}" varStatus="loop">
       <f:dropdownListBlock value="${d.clazz.name}" name="${d.displayName}"
                            selected="${it.launcher.descriptor==d}"
-- 
GitLab