diff options
author | Phil Hughes <me@iamphill.com> | 2016-04-11 11:07:02 +0100 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-04-20 15:42:09 -0400 |
commit | e219867cd031e313a8d3b553d34594f6b872ca42 (patch) | |
tree | 2f394e00ac300d9b63307fb627e60e54088bd0e8 /app | |
parent | 720da4196c80ea4d0e0a1a865d70fe04094e4472 (diff) | |
download | gitlab-ce-e219867cd031e313a8d3b553d34594f6b872ca42.tar.gz |
Updates sidebar value
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/due_date_select.js.coffee | 3 | ||||
-rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee index b6e96002dfd..58d4f79ed84 100644 --- a/app/assets/javascripts/due_date_select.js.coffee +++ b/app/assets/javascripts/due_date_select.js.coffee @@ -10,6 +10,7 @@ class @DueDateSelect $block = $dropdown.closest('.block') $selectbox = $dropdown.closest('.selectbox') $value = $block.find('.value') + $sidebarValue = $('.js-due-date-sidebar-value', $block) fieldName = $dropdown.data('field-name') abilityName = $dropdown.data('ability-name') @@ -44,8 +45,10 @@ class @DueDateSelect $value.removeAttr('style') $value.html(mediumDate) + $sidebarValue.html(mediumDate) ).done (data) -> $dropdown.trigger('loaded.gl.dropdown') + $dropdown.trigger('hidden.gl.dropdown') $loading.fadeOut() $datePicker.datepicker( diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index ecc075aa408..9cfc63dec3b 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -78,7 +78,7 @@ .block.due_date .sidebar-collapsed-icon = icon('calendar') - %span + %span.js-due-date-sidebar-value - if issuable.due_date = issuable.due_date.to_s(:medium) - else |