summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-15 15:43:26 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-15 15:43:26 +0000
commitbb59a1f98eb44cbe288d876eb963e9467b8637f4 (patch)
tree0c0ad27bc8781a853ced8382265efd19669f6930 /app/helpers
parent8b7bf2a0e0fb4ec5765f0b1da74a121a82659113 (diff)
parent33f8b06c3925fbefd6eac38efc71eac8b787ebd7 (diff)
downloadgitlab-ce-bb59a1f98eb44cbe288d876eb963e9467b8637f4.tar.gz
Merge branch 'assign-to-issuable-opener' into 'master'
Issuable can be assigned to author Closes #9014 The only difference with #9014 is that I thoughed the author should also be able to assign the issue. If this is unwanted behavior Ill revert it. /cc @DouweM See merge request !2765
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/selects_helper.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb
index 05386d790ca..4fc6de59a8b 100644
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
@@ -6,12 +6,13 @@ module SelectsHelper
value = opts[:selected] || ''
placeholder = opts[:placeholder] || 'Search for a user'
- null_user = opts[:null_user] || false
- any_user = opts[:any_user] || false
- email_user = opts[:email_user] || false
- first_user = opts[:first_user] && current_user ? current_user.username : false
- current_user = opts[:current_user] || false
- project = opts[:project] || @project
+ null_user = opts[:null_user] || false
+ any_user = opts[:any_user] || false
+ email_user = opts[:email_user] || false
+ first_user = opts[:first_user] && current_user ? current_user.username : false
+ current_user = opts[:current_user] || false
+ author_id = opts[:author_id] || ''
+ project = opts[:project] || @project
html = {
class: css_class,
@@ -21,7 +22,8 @@ module SelectsHelper
any_user: any_user,
email_user: email_user,
first_user: first_user,
- current_user: current_user
+ current_user: current_user,
+ author_id: author_id
}
}