diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-25 13:16:22 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-25 13:16:22 +0100 |
commit | 079d146278f1f95d748d3533b6eb9a108482bbc8 (patch) | |
tree | 2e2a0232f6638f225880629f1c96a5883b6288fd | |
parent | 5f276f353c08966c82431cb2a85ce743f779e111 (diff) | |
download | gitlab-ce-079d146278f1f95d748d3533b6eb9a108482bbc8.tar.gz |
Fixed users profile link in sidebar
Fixed new labels not being created
Fixed scrolling issues
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/boards/components/board_sidebar.js.es6 b/app/assets/javascripts/boards/components/board_sidebar.js.es6 index b20890df622..e83e69247d9 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js.es6 +++ b/app/assets/javascripts/boards/components/board_sidebar.js.es6 @@ -29,7 +29,8 @@ issue () { if (this.showSidebar) { this.$nextTick(() => { - $(".right-sidebar").getNiceScroll(0).doScrollTop(0, 0); + $('.right-sidebar').getNiceScroll(0).doScrollTop(0, 0); + $('.right-sidebar').getNiceScroll().resize(); }); } } diff --git a/app/assets/javascripts/due_date_select.js.es6 b/app/assets/javascripts/due_date_select.js.es6 index 4f7c1092d05..27a7b95e281 100644 --- a/app/assets/javascripts/due_date_select.js.es6 +++ b/app/assets/javascripts/due_date_select.js.es6 @@ -42,7 +42,7 @@ altField: "input[name='" + this.fieldName + "']", onSelect: () => { if (this.$dropdown.hasClass('js-issue-boards-due-date')) { - gl.issueBoards.BoardsStore.detail.issue.dueDate = $("input[name='" + this.fieldName + "']").val(); + gl.issueBoards.BoardsStore.detail.issue.dueDate = $(`input[name='${this.fieldName}']`).val(); this.updateIssueBoardIssue(); } else { return this.saveDueDate(true); diff --git a/app/views/projects/boards/components/sidebar/_assignee.html.haml b/app/views/projects/boards/components/sidebar/_assignee.html.haml index b90db421af0..604e13858d1 100644 --- a/app/views/projects/boards/components/sidebar/_assignee.html.haml +++ b/app/views/projects/boards/components/sidebar/_assignee.html.haml @@ -11,7 +11,7 @@ \- %a.js-assign-yourself{ href: "#" } assign yourself - %a.author_link.bold{ href: "", + %a.author_link.bold{ ":href" => "'#{root_url}' + issue.assignee.username", "v-if" => "issue.assignee" } %img.avatar.avatar-inline.s32{ ":src" => "issue.assignee.avatar", width: "32" } diff --git a/app/views/projects/boards/components/sidebar/_labels.html.haml b/app/views/projects/boards/components/sidebar/_labels.html.haml index a6d2c3c300c..ce68e5e1998 100644 --- a/app/views/projects/boards/components/sidebar/_labels.html.haml +++ b/app/views/projects/boards/components/sidebar/_labels.html.haml @@ -19,7 +19,7 @@ ":value" => "label.id" } .dropdown %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-issue-board-sidebar{ type: "button", - data: { toggle: "dropdown", field_name: "issue[label_names][]", show_no: "true", show_any: "true", project_id: @project.id, labels: namespace_project_labels_path(@project.namespace, @project, :json) }, + data: { toggle: "dropdown", field_name: "issue[label_names][]", show_no: "true", show_any: "true", project_id: @project.id, labels: namespace_project_labels_path(@project.namespace, @project, :json), namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path) }, ":data-issue-update" => "'#{namespace_project_issues_path(@project.namespace, @project)}/' + issue.id + '.json'" } %span.dropdown-toggle-text Label |