diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-04 17:19:14 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-04 17:19:14 +0300 |
| commit | b2bbac8850a18ccc65880dc5c300d0b6d39ab258 (patch) | |
| tree | 11987ee4d35a4bd7887c987a0722431db2c802e3 /app/assets | |
| parent | a3cc2f1e8dfcfb2f3e181fa570ed2ba245f9a069 (diff) | |
| parent | b7dff1b072204c8c2ad480301b3139e4823c41f4 (diff) | |
Merge branch '22588-todos-filter-shows-all-users' into 'master'
Fix: Todos Filter Shows All Users
Closes #22588
See merge request !7258
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/users_select.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 3847278e80a..7a2221dbaf5 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -23,6 +23,8 @@ $dropdown = $(dropdown); options.projectId = $dropdown.data('project-id'); options.showCurrentUser = $dropdown.data('current-user'); + options.todoFilter = $dropdown.data('todo-filter'); + options.todoStateFilter = $dropdown.data('todo-state-filter'); showNullUser = $dropdown.data('null-user'); showMenuAbove = $dropdown.data('showMenuAbove'); showAnyUser = $dropdown.data('any-user'); @@ -394,6 +396,8 @@ project_id: options.projectId || null, group_id: options.groupId || null, skip_ldap: options.skipLdap || null, + todo_filter: options.todoFilter || null, + todo_state_filter: options.todoStateFilter || null, current_user: options.showCurrentUser || null, push_code_to_protected_branches: options.pushCodeToProtectedBranches || null, author_id: options.authorId || null, |