Update template to work regardless of what base url execdb has.
AcceptedPublic
Actions

Authored by roshi on Apr 19 2017, 8:42 PM.

Details

Reviewers

tflink
jskladan
mkrizek

Maniphest Tasks

T930: Make job display bits of execdb more flexible

Summary

Insert some js to allow queries to work from '/' or '/execdb/'.

Test Plan

Run test suite.
Launch instance under different locations off of the FQDN.

Diff Detail

Repository

rEXECDB execdb

Branch

T930-Fix-URL-path (branched from develop)

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 1126
Build 1126: arc lint + arc unit

roshi created this revision.Apr 19 2017, 8:42 PM

Harbormaster completed building B1126: Diff 3018.Apr 19 2017, 8:42 PM

Why do it this way instead of using something like url_for?

I saw this issue as a js issue, and I fixed it as such. It could be done with a url_for(). But this way it's one line in a template which has minimal chance of impacting anything else and is easy to revert.

FWIW, it's pure JS - not jquery. So it'll work in all browsers [0].

[0] https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat

this is fine

This revision is now accepted and ready to land.Jun 20 2017, 11:31 AM

mkrizek resigned from this revision.Thu, Jul 13, 9:04 AM

Revision Contents

			Path	Packages
M			execdb/templates/show_job.html (2 lines)

Commit	Tree	Parents	Author	Summary	Date
81d61211a6db	4dd1966206c1	8b4ad610e563	Mike Ruckman	Update template to work regardless of what base url execdb has. (Show More…)	Apr 19 2017, 8:39 PM

Diff 3018

View Options

execdb/templates/show_job.html

1	{% extends "layout.html" %}	1	{% extends "layout.html" %}
2		2
3	{% block scripts %}	3	{% block scripts %}
4	<script>	4	<script>
5	function toggle_text_visibility(e){	5	function toggle_text_visibility(e){
6	$(e).find('#description').toggle();	6	$(e).find('#description').toggle();
7	}	7	}
8		8
9	function show_data(){	9	function show_data(){
10	$.get("/jobs/{{job.uuid}}/steps", function(data){	10	$.get("".concat(window.location.pathname, "/jobs/{{job.uuid}}/steps"), function(data){
11	console.log(data);	11	console.log(data);
12	$('#job_progress').empty();	12	$('#job_progress').empty();
13	var computed_job_status = "OK";	13	var computed_job_status = "OK";
14	data.steps.forEach(function(value){	14	data.steps.forEach(function(value){
15	var step_url = '<a href="'+data.buildbot_url+value.log_url+'"><i class="fa fa-external-link"></i></a>';	15	var step_url = '<a href="'+data.buildbot_url+value.log_url+'"><i class="fa fa-external-link"></i></a>';
16	var icon = '';	16	var icon = '';
17	var row_bgcolor = 'none';	17	var row_bgcolor = 'none';
18	if (value.status == 'INPROGRESS'){	18	if (value.status == 'INPROGRESS'){
▲ Show 20 Lines • Show All 229 Lines • Show Last 20 Lines