summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-05-05 19:17:28 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-05-05 19:17:28 +0000
commitaa874a1cd6fc94f6291a59fb414f3b09b3337c0d (patch)
tree1fbc687d9732273715115d0b945f329ce1d41a17 /app/helpers
parent0c5b7f8475926a5c97d42649dd12f4b4a32071d4 (diff)
parent933447e0da19f9d0be8574185500cabb5d7ab012 (diff)
downloadgitlab-ce-aa874a1cd6fc94f6291a59fb414f3b09b3337c0d.tar.gz
Merge branch 'mia_backort' into 'master'
Backport of Multiple Assignees feature See merge request !11089
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/form_helper.rb32
-rw-r--r--app/helpers/issuables_helper.rb10
2 files changed, 42 insertions, 0 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
index 1182939f656..53962b84618 100644
--- a/app/helpers/form_helper.rb
+++ b/app/helpers/form_helper.rb
@@ -15,4 +15,36 @@ module FormHelper
end
end
end
+
+ def issue_dropdown_options(issuable, has_multiple_assignees = true)
+ options = {
+ toggle_class: 'js-user-search js-assignee-search js-multiselect js-save-user-data',
+ title: 'Select assignee',
+ filter: true,
+ dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-assignee',
+ placeholder: 'Search users',
+ data: {
+ first_user: current_user&.username,
+ null_user: true,
+ current_user: true,
+ project_id: issuable.project.try(:id),
+ field_name: "#{issuable.class.model_name.param_key}[assignee_ids][]",
+ default_label: 'Assignee',
+ 'max-select': 1,
+ 'dropdown-header': 'Assignee',
+ multi_select: true,
+ 'input-meta': 'name',
+ 'always-show-selectbox': true,
+ current_user_info: current_user.to_json(only: [:id, :name])
+ }
+ }
+
+ if has_multiple_assignees
+ options[:title] = 'Select assignee(s)'
+ options[:data][:'dropdown-header'] = 'Assignee(s)'
+ options[:data].delete(:'max-select')
+ end
+
+ options
+ end
end
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 0b13dbf5f8d..7656929efe7 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -63,6 +63,16 @@ module IssuablesHelper
end
end
+ def users_dropdown_label(selected_users)
+ if selected_users.length == 0
+ "Unassigned"
+ elsif selected_users.length == 1
+ selected_users[0].name
+ else
+ "#{selected_users[0].name} + #{selected_users.length - 1} more"
+ end
+ end
+
def user_dropdown_label(user_id, default_label)
return default_label if user_id.nil?
return "Unassigned" if user_id == "0"