diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 18:39:12 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 18:39:12 +0300 |
| commit | faaca5e191f9fe3894ad7587b42495fcbcab9328 (patch) | |
| tree | dff5dce220d1de3e17e9f39d58bb658719ece282 /app/assets | |
| parent | 3589cc064c3ba0b5a6b062c317368dfe9183d1ba (diff) | |
| parent | dfbccdfc1b119ff801f810607b724e4572e37bb1 (diff) | |
Merge branch 'dm-more-namespace-full-path' into 'master'
Use Namespace#full_path instead of #path where appropriate
See merge request !9495
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 8df1c8e7f94..51fa5c828b3 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -39,7 +39,7 @@ $value = $block.find('.value'); $loading = $block.find('.block-loading').fadeOut(); if (issueUpdateURL) { - milestoneLinkTemplate = _.template('<a href="/<%- namespace %>/<%- path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>'); + milestoneLinkTemplate = _.template('<a href="/<%- full_path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>'); milestoneLinkNoneTemplate = '<span class="no-value">None</span>'; collapsedSidebarLabelTemplate = _.template('<span class="has-tooltip" data-container="body" title="<%- remaining %>" data-placement="left"> <%- title %> </span>'); } @@ -181,8 +181,7 @@ $selectbox.hide(); $value.css('display', ''); if (data.milestone != null) { - data.milestone.namespace = _this.currentProject.namespace; - data.milestone.path = _this.currentProject.path; + data.milestone.full_path = _this.currentProject.full_path; data.milestone.remaining = gl.utils.timeFor(data.milestone.due_date); $value.html(milestoneLinkTemplate(data.milestone)); return $sidebarCollapsedValue.find('span').html(collapsedSidebarLabelTemplate(data.milestone)); |