jro_apps/redmine Commit - r1386:7f8d959171c5

Show the project hierarchy in the drop down list for new membership on user administration screen....

Jean-Philippe Lang -

r1386:7f8d959171c5

parent child

Context file:

r1386:7f8d959171c5

Collapse all files

app/helpers/users_helper.rb +14 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module UsersHelper
               def status_options_for_select(selected)
                 options_for_select([[l(:label_all), ''],
                                     [l(:status_active), 1],
                                     [l(:status_registered), 2],
                                     [l(:status_locked), 3]], selected)
               end
+              # Options for the new membership projects combo-box
+              def projects_options_for_select(projects)
+                options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
+                projects_by_root = projects.group_by(&:root)
+                projects_by_root.keys.sort.each do |root|
+                  options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)))
+                  projects_by_root[root].sort.each do |project|
+                    next if project == root
+                    options << content_tag('option', '&#187; ' + h(project.name), :value => project.id)
+                  end
+                end
+                options
+              end
               def change_status_link(user)
                 url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
                 if user.locked?
                   link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
                 elsif user.registered?
                   link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
                 else
                   link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
                 end
               end
             end

app/views/users/_memberships.rhtml +6 -6

             <div class="box" style="margin-top: 16px;">
             <h3><%= l(:label_project_plural) %></h3>
             <% @user.memberships.each do |membership| %>
             <% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
             <p style="margin:0;padding-top:0;">
                 <label><%= membership.project.name %></label>
                 <select name="membership[role_id]">
                 <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
                 </select>
                 <%= submit_tag l(:button_change), :class => "button-small" %>
                 <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </p>
             <% end %>
             <% end %>
+            <% if @projects.any? %>
             <hr />
             <p>
             <label><%=l(:label_project_new)%></label><br/>
             <% form_tag({ :action => 'edit_membership', :id => @user }) do %>
-            <select name="membership[project_id]">
+            <%= select_tag 'membership[project_id]', projects_options_for_select(@projects) %>
-            <%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
+            <%= l(:label_role) %>:
-            </select>
+            <%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name") %>
-            <select name="membership[role_id]">
-            <%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
-            </select>
             <%= submit_tag l(:button_add) %>
             <% end %>
             </p>
+            <% end %>
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages