diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f78dbb9..2eaee8b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -331,6 +331,15 @@ module ApplicationHelper s.html_safe end + # Options for the new membership projects combo-box + def options_for_membership_project_select(principal, projects) + options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") + options << project_tree_options_for_select(projects) do |p| + {:disabled => principal.projects.include?(p)} + end + options + end + # Truncates and returns the string as a single line def truncate_single_line(string, *args) truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ') diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 3f6c679..0548153 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -18,15 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module GroupsHelper - # Options for the new membership projects combo-box - def options_for_membership_project_select(user, projects) - options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") - options << project_tree_options_for_select(projects) do |p| - {:disabled => (user.projects.include?(p))} - end - options - end - def group_settings_tabs tabs = [{:name => 'general', :partial => 'groups/general', :label => :label_general}, {:name => 'users', :partial => 'groups/users', :label => :label_user_plural}, diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index a264854..e93d308 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -26,15 +26,6 @@ module UsersHelper ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s) end - # Options for the new membership projects combo-box - def options_for_membership_project_select(user, projects) - options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") - options << project_tree_options_for_select(projects) do |p| - {:disabled => (user.projects.include?(p))} - end - options - end - def user_mail_notification_options(user) user.valid_notification_options.collect {|o| [l(o.last), o.first]} end