提交 055b1ce3 编写于 作者: M mindless

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
上级 b8355fe9
......@@ -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 -->
......
......@@ -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>
......@@ -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>
......@@ -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.
......
......@@ -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}"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册