diff options
| author | Mehmet Beydogan <mehmet.beydogan@gmail.com> | 2016-03-18 19:17:01 +0200 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-04-20 15:42:09 -0400 |
| commit | 61a306aa58f7fffd652a31b85719b19d08f0fd7f (patch) | |
| tree | d937ae097121109cc05070bde406ae7dc18416aa /app/views | |
| parent | 83bda94ffcfe1944ea255fdbb8dfd9dac5b97d9f (diff) | |
| download | gitlab-ce-61a306aa58f7fffd652a31b85719b19d08f0fd7f.tar.gz | |
Fix functionality of due this week. Add due this month and overdue, remove due tomorrow to issues.
Fix typos on sorting dropdown related to due date
Remove constant array and add Structs on Issue to keep due date data to fill options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/_sort_dropdown.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml index 80971309da7..922b02f9f3e 100644 --- a/app/views/shared/_sort_dropdown.html.haml +++ b/app/views/shared/_sort_dropdown.html.haml @@ -21,9 +21,9 @@ = link_to page_filter_path(sort: sort_value_milestone_later) do = sort_title_milestone_later = link_to page_filter_path(sort: sort_value_due_date_soon) do - = sort_title_due_date_soon if controller_name == "issues" + = sort_title_due_date_soon if @issues = link_to page_filter_path(sort: sort_value_due_date_later) do - = sort_title_due_date_later if controller_name == "issues" + = sort_title_due_date_later if @issues = link_to page_filter_path(sort: sort_value_upvotes) do = sort_title_upvotes = link_to page_filter_path(sort: sort_value_downvotes) do diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index f832f430b2b..7b76e7e368b 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -24,7 +24,7 @@ .filter-item.inline.labels-filter = render "shared/issuable/label_dropdown" - - if controller.controller_name == 'issues' + - if @issues .filter-item.inline.due_date-filter = select_tag('due_date', due_date_options, class: 'select2 trigger-submit', include_blank: true, diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index fb2c727d57a..8923efd2fc2 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -80,7 +80,6 @@ = icon('calendar') %span - if issuable.due_date - = icon('calendar') = issuable.due_date.to_s(:medium) - else .light None |