summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2014-06-25 16:58:49 +1000
committerDan Callaghan <dcallagh@redhat.com>2014-06-25 16:58:49 +1000
commit0efb8c7a216ec39fce5d4e99adb16af7f4888700 (patch)
tree0a34df024985c14037c06040bd96eddf8b3cb133
parent39512290f57f33f1aaa95a482bb6f3dd459f20bb (diff)
new menu item Systems -> Reserve linking to Reserve Workflow
-rw-r--r--IntegrationTests/src/bkr/inttest/server/selenium/test_system_menu_tests.py2
-rw-r--r--Server/bkr/server/templates/master.kid3
2 files changed, 4 insertions, 1 deletions
diff --git a/IntegrationTests/src/bkr/inttest/server/selenium/test_system_menu_tests.py b/IntegrationTests/src/bkr/inttest/server/selenium/test_system_menu_tests.py
index 8c4d864..46209a5 100644
--- a/IntegrationTests/src/bkr/inttest/server/selenium/test_system_menu_tests.py
+++ b/IntegrationTests/src/bkr/inttest/server/selenium/test_system_menu_tests.py
@@ -32,6 +32,8 @@ class Menu(WebDriverTestCase):
b.find_element_by_xpath('//title[text()="Available Systems"]')
click_menu_item(b, 'Systems', 'Free')
b.find_element_by_xpath('//title[text()="Free Systems"]')
+ click_menu_item(b, 'Systems', 'Reserve')
+ b.find_element_by_xpath('//title[text()="Reserve Workflow"]')
click_menu_item(b, 'Devices', 'All')
b.find_element_by_xpath('//title[text()="Devices"]')
click_menu_item(b, 'Devices', 'IDE')
diff --git a/Server/bkr/server/templates/master.kid b/Server/bkr/server/templates/master.kid
index 1ebe80f..6e05292 100644
--- a/Server/bkr/server/templates/master.kid
+++ b/Server/bkr/server/templates/master.kid
@@ -33,6 +33,7 @@ from bkr.server.reports import Reports
<li><a href="${tg.url('/available/')}">Available</a></li>
<li><a href="${tg.url('/free/')}">Free</a></li>
<li><a href="${tg.url('/removed/')}">Removed</a></li>
+ <li><a href="${tg.url('/reserveworkflow/')}">Reserve</a></li>
</ul>
</li>
<li class="dropdown">
@@ -70,7 +71,7 @@ from bkr.server.reports import Reports
<li><a href="${tg.url('/tasks/new')}">New Task</a></li>
<li><a href="${tg.url('/tasks')}">Task Library</a></li>
<li><a href="${tg.url('/watchdogs')}">Watchdog</a></li>
- <li><a href="${tg.url('/reserveworkflow')}">Reserve</a></li>
+ <li><a href="${tg.url('/reserveworkflow/')}">Reserve</a></li>
</ul>
</li>
<li class="dropdown">