jro_apps/redmine Commit - r3870:5345a2dd8979

Merged r3934 from trunk....

Eric Davis -

r3870:5345a2dd8979

parent child

Context file:

r3870:5345a2dd8979

Collapse all files

app/controllers/groups_controller.rb +8 0

             # Redmine - project management software
             # Copyright (C) 2006-2009  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 GroupsController < ApplicationController
               layout 'admin'
               before_filter :require_admin
               helper :custom_fields
               # GET /groups
               # GET /groups.xml
               def index
                 @groups = Group.find(:all, :order => 'lastname')
                 respond_to do |format|
                   format.html # index.html.erb
                   format.xml  { render :xml => @groups }
                 end
               end
               # GET /groups/1
               # GET /groups/1.xml
               def show
                 @group = Group.find(params[:id])
                 respond_to do |format|
                   format.html # show.html.erb
                   format.xml  { render :xml => @group }
                 end
               end
               # GET /groups/new
               # GET /groups/new.xml
               def new
                 @group = Group.new
                 respond_to do |format|
                   format.html # new.html.erb
                   format.xml  { render :xml => @group }
                 end
               end
               # GET /groups/1/edit
               def edit
                 @group = Group.find(params[:id], :include => :projects)
               end
               # POST /groups
               # POST /groups.xml
               def create
                 @group = Group.new(params[:group])
                 respond_to do |format|
                   if @group.save
                     flash[:notice] = l(:notice_successful_create)
                     format.html { redirect_to(groups_path) }
                     format.xml  { render :xml => @group, :status => :created, :location => @group }
                   else
                     format.html { render :action => "new" }
                     format.xml  { render :xml => @group.errors, :status => :unprocessable_entity }
                   end
                 end
               end
               # PUT /groups/1
               # PUT /groups/1.xml
               def update
                 @group = Group.find(params[:id])
                 respond_to do |format|
                   if @group.update_attributes(params[:group])
                     flash[:notice] = l(:notice_successful_update)
                     format.html { redirect_to(groups_path) }
                     format.xml  { head :ok }
                   else
                     format.html { render :action => "edit" }
                     format.xml  { render :xml => @group.errors, :status => :unprocessable_entity }
                   end
                 end
               end
               # DELETE /groups/1
               # DELETE /groups/1.xml
               def destroy
                 @group = Group.find(params[:id])
                 @group.destroy
                 respond_to do |format|
                   format.html { redirect_to(groups_url) }
                   format.xml  { head :ok }
                 end
               end
               def add_users
                 @group = Group.find(params[:id])
                 users = User.find_all_by_id(params[:user_ids])
                 @group.users << users if request.post?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
                   format.js {
                     render(:update) {|page|
                       page.replace_html "tab-content-users", :partial => 'groups/users'
                       users.each {|user| page.visual_effect(:highlight, "user-#{user.id}") }
                     }
                   }
                 end
               end
               def remove_user
                 @group = Group.find(params[:id])
                 @group.users.delete(User.find(params[:user_id])) if request.post?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
                   format.js { render(:update) {|page| page.replace_html "tab-content-users", :partial => 'groups/users'} }
                 end
               end
               def autocomplete_for_user
                 @group = Group.find(params[:id])
                 @users = User.active.like(params[:q]).find(:all, :limit => 100) - @group.users
                 render :layout => false
               end
               def edit_membership
                 @group = Group.find(params[:id])
                 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
                 @membership.save if request.post?
                 respond_to do |format|
+                  if @membership.valid?
                     format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
                         page.visual_effect(:highlight, "member-#{@membership.id}")
                       }
                     }
+                  else
+                    format.js {
+                      render(:update) {|page|
+                        page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
+                      }
+                    }
+                  end
                 end
               end
               def destroy_membership
                 @group = Group.find(params[:id])
                 Member.find(params[:membership_id]).destroy if request.post?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
                   format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'groups/memberships'} }
                 end
               end
             end

app/controllers/users_controller.rb +8 0

             # Redmine - project management software
             # Copyright (C) 2006-2009  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 'admin'
               before_filter :require_admin, :except => :show
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 sort_init 'login', 'asc'
                 sort_update %w(login firstname lastname mail admin created_on last_login_on)
                 @status = params[:status] ? params[:status].to_i : 1
                 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
                 unless params[:name].blank?
                   name = "%#{params[:name].strip.downcase}%"
                   c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ? OR LOWER(mail) LIKE ?", name, name, name, name]
                 end
                 @user_count = User.count(:conditions => c.conditions)
                 @user_pages = Paginator.new self, @user_count,
             								per_page_option,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
                                     :conditions => c.conditions,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :layout => !request.xhr?
               end
               def show
                 @user = User.find(params[:id])
                 @custom_values = @user.custom_values
                 # show only public projects and private projects that the logged in user is also a member of
                 @memberships = @user.memberships.select do |membership|
                   membership.project.is_public? || (User.current.member_of?(membership.project))
                 end
                 events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
                 @events_by_day = events.group_by(&:event_date)
                 unless User.current.admin?
                   if !@user.active? || (@user != User.current  && @memberships.empty? && events.empty?)
                     render_404
                     return
                   end
                 end
                 render :layout => 'base'
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def add
                 if request.get?
                   @user = User.new(:language => Setting.default_language)
                 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
                   if @user.save
                     Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to(params[:continue] ? {:controller => 'users', :action => 'add'} :
                                                     {:controller => 'users', :action => 'edit', :id => @user})
                     return
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.post?
                   @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
                   @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
                   @user.attributes = params[:user]
                   # Was the account actived ? (do it before User#save clears the change)
                   was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
                   if @user.save
                     if was_activated
                       Mailer.deliver_account_activated(@user)
                     elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
                       Mailer.deliver_account_information(@user, params[:password])
                     end
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :back
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @membership ||= Member.new
               rescue ::ActionController::RedirectBackError
                 redirect_to :controller => 'users', :action => 'edit', :id => @user
               end
               def edit_membership
                 @user = User.find(params[:id])
                 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
                 @membership.save if request.post?
                 respond_to do |format|
+                  if @membership.valid?
                     format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-memberships", :partial => 'users/memberships'
                         page.visual_effect(:highlight, "member-#{@membership.id}")
                       }
                     }
+                  else
+                    format.js {
+                      render(:update) {|page|
+                        page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
+                      }
+                    }
+                  end
                 end
               end
               def destroy_membership
                 @user = User.find(params[:id])
                 @membership = Member.find(params[:membership_id])
                 if request.post? && @membership.deletable?
                   @membership.destroy
                 end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
                   format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} }
                 end
               end
             end

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