jro_apps/redmine Commit - r115:4c84165aa074

added the ability to manage users memberships directly on users/edit (administration module)...

Jean-Philippe Lang -

r115:4c84165aa074

parent child

Context file:

r115:4c84165aa074

Collapse all files

app/views/users/_memberships.rhtml created 644 +29 0

@@ -0,0 +1,29
	1	<div class="box" style="margin-top: 16px;">
	2	<h3><%= l(:label_project_plural) %></h3>
	3
	4	<% @user.memberships.each do \|membership\| %>
	5	<%= start_form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") %>
	6	<p style="margin:0;padding-top:0;">
	7	<label><%= membership.project.name %></label>
	8	<select name="membership[role_id]">
	9	<%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
	10	</select>
	11	<%= submit_tag l(:button_change), :class => "button-small" %>
	12	<%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
	13	</p>
	14	<%= end_form_tag %>
	15	<% end %>
	16	<hr />
	17	<p>
	18	<label><%=l(:label_project_new)%></label><br/>
	19	<%= start_form_tag({ :action => 'edit_membership', :id => @user }) %>
	20	<select name="membership[project_id]">
	21	<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
	22	</select>
	23	<select name="membership[role_id]">
	24	<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
	25	</select>
	26	<%= submit_tag l(:button_add) %>
	27	<%= end_form_tag %>
	28	</p>
	29	</div> No newline at end of file

public/images/arrow_down.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

app/controllers/users_controller.rb +21 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.
             class UsersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @user_count = User.count
                 @user_pages = Paginator.new self, @user_count,
 ,
             								@params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => $RDM_DEFAULT_LANG)
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                   @user.custom_values = @custom_values
                   if @user.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.get?
                   @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 else
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
                   if params[:custom_fields]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                   end
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
+                @roles = Role.find :all
+                @projects = Project.find(:all) - @user.projects
+                @membership ||= Member.new
+              end
+              def edit_membership
+                @user = User.find(params[:id])
+                @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
+                @membership.attributes = params[:membership]
+                if request.post? and @membership.save
+                  flash[:notice] = l(:notice_successful_update)
+                end
+                redirect_to :action => 'edit', :id => @user and return
+              end
+              def destroy_membership
+                @user = User.find(params[:id])
+                if request.post? and Member.find(params[:membership_id]).destroy
+                  flash[:notice] = l(:notice_successful_update)
+                end
+                redirect_to :action => 'edit', :id => @user and return
               end
               def destroy
                 User.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete user"
                 redirect_to :action => 'list'
               end
             end

app/views/users/edit.rhtml +2 0

             <h2><%=l(:label_user)%></h2>
             <% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>
+            <%= render :partial => 'memberships' %>
  No newline at end of file

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