kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Completed project filter dropdown, still need to move it from inline to ProjectSelect.js (or different)

This commit is contained in:
Luke Bennett 2016-08-28 00:09:21 +01:00
parent beff8b9bd0
commit 0e2dd06f25
No known key found for this signature in database
GPG Key ID: A738E9C68D3BF31A
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/gl_dropdown.js
View File

@ -202,7 +202,6 @@
var ref, ref1, ref2, ref3, searchFields, selector, self; var ref, ref1, ref2, ref3, searchFields, selector, self;
this.el = el1; this.el = el1;
this.options = options; this.options = options;
console.log(this.options);
this.updateLabel = bind(this.updateLabel, this); this.updateLabel = bind(this.updateLabel, this);
this.hidden = bind(this.hidden, this); this.hidden = bind(this.hidden, this);
this.opened = bind(this.opened, this); this.opened = bind(this.opened, this);

2
app/helpers/issuables_helper.rb
View File

@ -56,7 +56,7 @@ module IssuablesHelper
project = Project.find_by(id: project_id) project = Project.find_by(id: project_id)
if project if project
project.name_with_namespace || project.name project.name_with_namespace
else else
default_label default_label
end end

8
app/views/dashboard/todos/index.html.haml
View File

@ -88,7 +88,13 @@
filterable: true, filterable: true,
selectable: true, selectable: true,
fieldName: 'project_id', fieldName: 'project_id',
data: $projectDropdown.data('data') data: $projectDropdown.data('data'),
clicked: function() {
if ($projectDropdown.hasClass('js-filter-submit')) {
console.log('booM!');
return $projectDropdown.closest('form').submit();
}
}
}); });
$('form.filter-form').on('submit', function (event) { $('form.filter-form').on('submit', function (event) {