diff options
| -rw-r--r-- | lorrycontroller/readconf.py | 6 | ||||
| -rw-r--r-- | lorrycontroller/status.py | 5 | ||||
| -rw-r--r-- | templates/status.tpl | 15 |
3 files changed, 21 insertions, 5 deletions
diff --git a/lorrycontroller/readconf.py b/lorrycontroller/readconf.py index 4aa3161..a42458b 100644 --- a/lorrycontroller/readconf.py +++ b/lorrycontroller/readconf.py @@ -90,10 +90,10 @@ class ReadConfiguration(lorrycontroller.LorryControllerRoute): statedb.remove_trove(trovehost) statedb.remove_lorries_for_trovehost(trovehost) - if 'redirect' in bottle.request.forms: - bottle.redirect(bottle.request.forms.redirect) + if 'redirect' in bottle.request.forms: + bottle.redirect(bottle.request.forms.redirect) - return 'Configuration has been updated.' + return 'Configuration has been updated.' def get_confgit(self): if self.app_settings['debug-real-confgit']: diff --git a/lorrycontroller/status.py b/lorrycontroller/status.py index 5e011d5..b0a3807 100644 --- a/lorrycontroller/status.py +++ b/lorrycontroller/status.py @@ -37,6 +37,7 @@ class StatusRenderer(object): 'troves': self.get_troves(statedb), 'warning_msg': '', 'max_jobs': self.get_max_jobs(statedb), + 'links': True, } status.update(self.get_free_disk_space(work_directory)) return status @@ -45,7 +46,9 @@ class StatusRenderer(object): return bottle.template(template, **status) def write_status_as_html(self, template, status, filename): - html = self.render_status_as_html(template, status) + modified_status = dict(status) + modified_status['links'] = False + html = self.render_status_as_html(template, modified_status) try: with open(filename, 'w') as f: f.write(html) diff --git a/templates/status.tpl b/templates/status.tpl index eef9e95..9201f04 100644 --- a/templates/status.tpl +++ b/templates/status.tpl @@ -65,17 +65,26 @@ </tr> % for spec in run_queue: % if spec['running_job'] is not None: +% if links: <tr> <td><a href="/1.0/job-html/{{spec['running_job']}}">{{spec['running_job']}}</a></td> <td><a href="/1.0/lorry-html/{{spec['path']}}">{{spec['path']}}</a></td> </tr> +% else: +<tr> +<td>{{spec['running_job']}}</td> +<td>{{spec['path']}}</td> +</tr> +% end % end % end </table> % end +% if links: <p>See separate list of <a href="/1.0/list-jobs-html">all jobs that have ever been started</a>.</p> +% end <h2>Run-queue</h2> @@ -93,10 +102,14 @@ % fields = obj[name] <tr> <td>{{i+1}}</td> +% if links: <td><a href="/1.0/lorry-html/{{spec['path']}}">{{spec['path']}}</a></td> +% else: +<td>{{spec['path']}}</td> +% end <td>{{spec['interval_nice']}}</td> <td>{{spec['due_nice']}}</td> -% if spec['running_job']: +% if spec['running_job'] and links: <td><a href="/1.0/job-html/{{spec['running_job']}}">{{spec['running_job']}}</a></td> % else: <td></td> |