Merge lp:~cprov/uci-engine/webui-reviews into lp:uci-engine

Proposed by Celso Providelo
Status: Work in progress
Proposed branch: lp:~cprov/uci-engine/webui-reviews
Merge into: lp:uci-engine
Prerequisite: lp:~cprov/uci-engine/ts-workflow
Diff against target: 92 lines (+54/-0)
2 files modified
webui/common/static/common/webui.css (+11/-0)
webui/tickets/static/tickets/webui.js (+43/-0)
To merge this branch: bzr merge lp:~cprov/uci-engine/webui-reviews
Reviewer Review Type Date Requested Status
Canonical CI Engineering Pending
Review via email: mp+239595@code.launchpad.net

Description of the change

Handling ticket reviews in the webui ...

To post a comment you must log in.

Unmerged revisions

868. By Celso Providelo

Presenting reviews in the ticket-status section.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'webui/common/static/common/webui.css'
--- webui/common/static/common/webui.css 2014-10-24 18:04:42 +0000
+++ webui/common/static/common/webui.css 2014-10-24 18:04:43 +0000
@@ -279,6 +279,10 @@
279 font-weight: bold;279 font-weight: bold;
280}280}
281281
282td.dt-status-value select {
283 font-size: small;
284}
285
282/* General links decorators. */286/* General links decorators. */
283a.image-link {287a.image-link {
284 background-image: url('/static/common/cdrom.svg');288 background-image: url('/static/common/cdrom.svg');
@@ -307,3 +311,10 @@
307 background-size: contain;311 background-size: contain;
308 padding-left: 1.2em;312 padding-left: 1.2em;
309}313}
314
315a.pending-review-link {
316 background-image: url('/static/common/pencil-black.png');
317 background-repeat: no-repeat;
318 background-size: contain;
319 padding-left: 1.2em;
320}
310321
=== modified file 'webui/tickets/static/tickets/webui.js'
--- webui/tickets/static/tickets/webui.js 2014-10-24 18:04:42 +0000
+++ webui/tickets/static/tickets/webui.js 2014-10-24 18:04:43 +0000
@@ -458,6 +458,14 @@
458 'continue': ('<img src="{static_prefix}spinner3.gif" ' +458 'continue': ('<img src="{static_prefix}spinner3.gif" ' +
459 'title="{title}"/></br>')459 'title="{title}"/></br>')
460 };460 };
461 var review_options = [
462 {value: 'Approve', text: 'Approve'},
463 {value: 'Needs Fixing', text: 'Needs Fixing'},
464 {value: 'Needs Info', text: 'Needs Info'},
465 {value: 'Abstain', text: 'Abstain'},
466 {value: 'Disapprove', text: 'Disapprove'},
467 {value: 'Resubmit', text: 'Resubmit'},
468 ];
461 var dataset = [];469 var dataset = [];
462 var step_values = {};470 var step_values = {};
463 var hidden_steps = Y.Array([471 var hidden_steps = Y.Array([
@@ -488,6 +496,13 @@
488 // be rendered for citrain tickets.496 // be rendered for citrain tickets.
489 return;497 return;
490 }498 }
499 // Collect step reviews.
500 obj.reviews = [];
501 Y.Array.each(ticket.reviews, function(review) {
502 if (review.workflow_step === obj.name) {
503 obj.reviews.push(review);
504 }
505 });
491506
492 // Collect related ticket/subticket artifacts.507 // Collect related ticket/subticket artifacts.
493 var prefix = 'misc';508 var prefix = 'misc';
@@ -549,6 +564,34 @@
549 value += c.getHTML() + '</br>';564 value += c.getHTML() + '</br>';
550 });565 });
551566
567 // Render related reviews.
568 var review_table = Y.Node.create('<table>')
569 Y.Array.each(o.data.reviews, function (review) {
570 var label = Y.Node.create('<td>');
571 label.appendChild(
572 Y.Node.create('<a>')
573 .set('text', review.review_type + ':')
574 .addClass('pending-review-link')
575 );
576 var select = Y.Node.create('<select>');
577 Y.Array.each(review_options, function(opt) {
578 select.appendChild(
579 Y.Node.create('<option>')
580 .set('text', opt.text)
581 .set('value', opt.value)
582 );
583 });
584 var control = Y.Node.create('<td>');
585 control.appendChild(select);
586 var row = Y.Node.create('<tr>');
587 row.appendChild(label);
588 row.appendChild(control);
589 review_table.appendChild(row);
590 });
591 var c = Y.Node.create('<div>');
592 c.appendChild(review_table);
593 value += c.getHTML();
594
552 return value;595 return value;
553 };596 };
554597

Subscribers

People subscribed via source and target branches