diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-08-26 07:55:24 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-08-26 07:55:24 +0200 |
| commit | 9263f397e701f25af395e8cdee48c87ee3327157 (patch) | |
| tree | cc7f6b6beef8947090a108701ca34316a5c8edb8 /extensions/MyDashboard | |
| parent | 23b94e8410d90e9e15584d3a9220b6bb214f4220 (diff) | |
| parent | d57aefa118802606ea7cc424aaa62173be9eec41 (diff) | |
| download | bugzilla-9263f397e701f25af395e8cdee48c87ee3327157.tar.gz bugzilla-9263f397e701f25af395e8cdee48c87ee3327157.tar.xz | |
Merge remote-tracking branch 'bmo/mojo'
Diffstat (limited to 'extensions/MyDashboard')
| -rw-r--r-- | extensions/MyDashboard/Extension.pm | 2 | ||||
| -rw-r--r-- | extensions/MyDashboard/web/js/flags.js | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/extensions/MyDashboard/Extension.pm b/extensions/MyDashboard/Extension.pm index 5278cfaa4..fc3a689bf 100644 --- a/extensions/MyDashboard/Extension.pm +++ b/extensions/MyDashboard/Extension.pm @@ -106,7 +106,7 @@ sub _component_watcher_ids { WHERE product_id = ? AND (component_id = ? OR component_id IS NULL - OR ? LIKE CONCAT(component_prefix, '%'))"; + OR ? LIKE @{[$dbh->sql_string_concat('component_prefix', q{'%'})]})"; $self->{watcher_ids} ||= $dbh->selectcol_arrayref($query, undef, $self->product_id, $self->id, $self->name); diff --git a/extensions/MyDashboard/web/js/flags.js b/extensions/MyDashboard/web/js/flags.js index 425e42e57..8931e277a 100644 --- a/extensions/MyDashboard/web/js/flags.js +++ b/extensions/MyDashboard/web/js/flags.js @@ -154,11 +154,10 @@ $(function () { '<tr class="' + row.getAttribute('class') + '">' + '<td class="yui3-datatable-cell" colspan="4">' + '<a href="' + o.data.url + '" target="_blank">' + - Y.Escape.html('D' + o.data.id + ' - ' + o.data.title) + - '</a></td></tr>', - 'before'); + Y.Escape.html(o.data.title) + '</a></td></tr>', + 'after'); - o.cell.set('text', o.data.status == 'added' ? 'pending' : o.data.status); + o.cell.setHTML('<a href="' + o.data.url + '">D' + o.data.id + '</a>'); return false; }; @@ -179,7 +178,9 @@ $(function () { dataTable.reviews = new Y.DataTable({ columns: [ { key: 'author_email', label: 'Requester', sortable: true, - formattter: phabAuthorFormatter, allowHTML: true }, + formatter: phabAuthorFormatter, allowHTML: true }, + { key: 'id', label: 'Revision', sortable: true, + nodeFormatter: phabRowFormatter, allowHTML: true }, { key: 'bug_id', label: 'Bug', sortable: true, formatter: bugLinkFormatter, allowHTML: true }, { key: 'updated', label: 'Updated', sortable: true, |