jro_apps/redmine Commit - r1389:63951812a1ed

Split user edit screen into tabs....

Jean-Philippe Lang -

r1389:63951812a1ed

parent child

Context file:

r1389:63951812a1ed

Collapse all files

app/views/users/_general.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	<% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do \|f\| %>
	2	<%= render :partial => 'form', :locals => { :f => f } %>
	3	<%= submit_tag l(:button_save) %>
	4	<% end %>

app/controllers/users_controller.rb +5 -8

             # redMine - project management software
             # Copyright (C) 2006-2007  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
                 @status = params[:status] ? params[:status].to_i : 1
                 conditions = "status <> 0"
                 conditions = ["status=?", @status] unless @status == 0
                 @user_count = User.count(:conditions => conditions)
                 @user_pages = Paginator.new self, @user_count,
             								per_page_option,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
                                     :conditions => conditions,
             						: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 => Setting.default_language)
                   @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").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, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
                   @user.custom_values = @custom_values
                   if @user.save
                     Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                     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, :order => "#{CustomField.table_name}.position").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, :order => "#{CustomField.table_name}.position").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)
                     # Give a string to redirect_to otherwise it would use status param as the response code
                     redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @roles = Role.find_all_givable
                 @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
                 @membership ||= Member.new
+                @memberships = @user.memberships
               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
+                @membership.save if request.post?
-                  flash[:notice] = l(:notice_successful_update)
+                redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
-                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
+                Member.find(params[:membership_id]).destroy if request.post?
-                  flash[:notice] = l(:notice_successful_update)
+                redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
-                end
-                redirect_to :action => 'edit', :id => @user and return
               end
             end

app/helpers/users_helper.rb +6 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
+              def user_settings_tabs
+                tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
+                        {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
+                        ]
+              end
             end

app/views/users/_form.rhtml 0 -1

             <%= error_messages_for 'user' %>
             <!--[form:user]-->
             <div class="box">
-            <h3><%=l(:label_information_plural)%></h3>
             <p><%= f.text_field :login, :required => true, :size => 25  %></p>
             <p><%= f.text_field :firstname, :required => true %></p>
             <p><%= f.text_field :lastname, :required => true %></p>
             <p><%= f.text_field :mail, :required => true %></p>
             <p><%= f.select :language, lang_options_for_select %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end if @custom_values%>
             <p><%= f.check_box :admin %></p>
             </div>
             <div class="box">
             <h3><%=l(:label_authentication)%></h3>
             <% unless @auth_sources.empty? %>
             <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
             <% end %>
             <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
             <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
             <%= password_field_tag 'password', nil, :size => 25  %><br />
             <em><%= l(:text_caracters_minimum, 4) %></em></p>
             <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             </div>
             </div>
             <!--[eoform:user]-->

app/views/users/_memberships.rhtml +26 -15

@@ -1,29 +1,40
1	<div class="box" style="margin-top: 16px;">	1	<% if @memberships.any? %>
2	<h3><%= l(:label_project_plural) %></h3>	2	<table class="list memberships">
3		3	<thead>
4	<% @user.memberships.each do \|membership\| %>	4	<th><%= l(:label_project) %></th>
5	<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>	5	<th><%= l(:label_role) %></th>
6	<p style="margin:0;padding-top:0;">	6	<th style="width:15%"></th>
7	<label><%= membership.project.name %></label>	7	</thead>
8	<select name="membership[role_id]">	8	<tbody>
9	<%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>	9	<% @memberships.each do \|membership\| %>
10	</select>	10	<% next if membership.new_record? %>
11	<%= submit_tag l(:button_change), :class => "button-small" %>	11	<tr class="<%= cycle 'odd', 'even' %>">
12	<%= 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' %>	12	<td><%=h membership.project %></td>
13	</p>	13	<td align="center">
		14	<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }) do %>
		15	<%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name", membership.role_id) %>
		16	<%= submit_tag l(:button_change), :class => "small" %>
14	<% end %>	17	<% end %>
		18	</td>
		19	<td align="center">
		20	<%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
		21	</td>
		22	</tr>
		23	</tbody>
		24	<% end; reset_cycle %>
		25	</table>
		26	<% else %>
		27	<p class="nodata"><%= l(:label_no_data) %></p>
15	<% end %>	28	<% end %>
16		29
17	<% if @projects.any? %>	30	<% if @projects.any? %>
18	<hr />
19	<p>	31	<p>
20	<label><%=l(:label_project_new)%></label><br/>	32	<label><%=l(:label_project_new)%></label><br/>
21	<% form_tag({ :action => 'edit_membership', :id => @user }) do %>	33	<% form_tag({ :action => 'edit_membership', :id => @user }) do %>
22	<%= select_tag 'membership[project_id]', projects_options_for_select(@projects) %>	34	<%= select_tag 'membership[project_id]', projects_options_for_select(@projects) %>
23	<%= l(:label_role) %>:	35	<%= l(:label_role) %>:
24	<%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name") %>	36	<%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name") %>
25	<%= submit_tag l(:button_add) %>	37	<%= submit_tag l(:button_add) %>
26	<% end %>	38	<% end %>
27	</p>	39	</p>
28	<% end %>	40	<% end %>
29	</div> No newline at end of file

app/views/users/edit.rhtml +21 -6

@@ -1,8 +1,23
1	<h2><%=l(:label_user)%></h2>	1	<h2><%=l(:label_user)%>: <%=h @user.login %></h2>
2		2
3	<% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do \|f\| %>	3	<% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>
4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_save) %>
6	<% end %>
7		4
8	<%= render :partial => 'memberships' %> No newline at end of file	5	<div class="tabs">
		6	<ul>
		7	<% user_settings_tabs.each do \|tab\| -%>
		8	<li><%= link_to l(tab[:label]), { :tab => tab[:name] },
		9	:id => "tab-#{tab[:name]}",
		10	:class => (tab[:name] != selected_tab ? nil : 'selected'),
		11	:onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
		12	<% end -%>
		13	</ul>
		14	</div>
		15
		16	<% user_settings_tabs.each do \|tab\| -%>
		17	<%= content_tag('div', render(:partial => tab[:partial]),
		18	:id => "tab-content-#{tab[:name]}",
		19	:style => (tab[:name] != selected_tab ? 'display:none' : nil),
		20	:class => 'tab-content') %>
		21	<% end -%>
		22
		23	<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>

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