jro_apps/redmine Commit - r13220:1508cd7b8bf9

Moved new group user to its own action GroupsController#new_users....

Jean-Philippe Lang -

r13220:1508cd7b8bf9

parent child

Context file:

r13220:1508cd7b8bf9

Collapse all files

app/views/groups/_new_users_form.html.erb created 644 +9 0

@@ -0,0 +1,9
	1	<fieldset class="box">
	2	<legend><%= label_tag "user_search", l(:label_user_search) %></legend>
	3	<p><%= text_field_tag 'user_search', nil %></p>
	4	<%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
	5
	6	<div id="users">
	7	<%= render_principals_for_new_group_users(@group) %>
	8	</div>
	9	</fieldset>

app/views/groups/_new_users_modal.html.erb created 644 +9 0

@@ -0,0 +1,9
	1	<h3 class="title"><%= l(:label_user_new) %></h3>
	2
	3	<%= form_for(@group, :url => group_users_path(@group), :remote => true, :method => :post) do \|f\| %>
	4	<%= render :partial => 'new_users_form' %>
	5	<p class="buttons">
	6	<%= submit_tag l(:button_add) %>
	7	<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
	8	</p>
	9	<% end %>

app/views/groups/new_users.html.erb created 644 +6 0

@@ -0,0 +1,6
	1	<h2><%= l(:label_user_new) %></h2>
	2
	3	<%= form_for(@group, :url => group_users_path(@group), :method => :post) do \|f\| %>
	4	<%= render :partial => 'new_users_form' %>
	5	<p><%= submit_tag l(:button_add) %></p>
	6	<% end %>

app/views/groups/new_users.js.erb created 644 +2 0

@@ -0,0 +1,2
	1	$('#ajax-modal').html('<%= escape_javascript(render :partial => 'groups/new_users_modal') %>');
	2	showModal('ajax-modal', '700px');

app/controllers/groups_controller.rb +3 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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
               before_filter :find_group, :except => [:index, :new, :create]
               accept_api_auth :index, :show, :create, :update, :destroy, :add_users, :remove_user
               helper :custom_fields
               helper :principal_memberships
               def index
                 respond_to do |format|
                   format.html {
                     @groups = Group.sorted.to_a
                     @user_count_by_group_id = user_count_by_group_id
                   }
                   format.api {
                     scope = Group.sorted
                     scope = scope.givable unless params[:builtin] == '1'
                     @groups = scope.to_a
                   }
                 end
               end
               def show
                 respond_to do |format|
                   format.html
                   format.api
                 end
               end
               def new
                 @group = Group.new
               end
               def create
                 @group = Group.new
                 @group.safe_attributes = params[:group]
                 respond_to do |format|
                   if @group.save
                     format.html {
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to(params[:continue] ? new_group_path : groups_path)
                     }
                     format.api  { render :action => 'show', :status => :created, :location => group_url(@group) }
                   else
                     format.html { render :action => "new" }
                     format.api  { render_validation_errors(@group) }
                   end
                 end
               end
               def edit
               end
               def update
                 @group.safe_attributes = params[:group]
                 respond_to do |format|
                   if @group.save
                     flash[:notice] = l(:notice_successful_update)
                     format.html { redirect_to(groups_path) }
                     format.api  { render_api_ok }
                   else
                     format.html { render :action => "edit" }
                     format.api  { render_validation_errors(@group) }
                   end
                 end
               end
               def destroy
                 @group.destroy
                 respond_to do |format|
                   format.html { redirect_to(groups_path) }
                   format.api  { render_api_ok }
                 end
               end
+              def new_users
+              end
               def add_users
                 @users = User.where(:id => (params[:user_id] || params[:user_ids])).to_a
                 @group.users << @users if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                   format.js
                   format.api { render_api_ok }
                 end
               end
               def remove_user
                 @group.users.delete(User.find(params[:user_id])) if request.delete?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                   format.js
                   format.api { render_api_ok }
                 end
               end
               def autocomplete_for_user
                 respond_to do |format|
                   format.js
                 end
               end
               private
               def find_group
                 @group = Group.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def user_count_by_group_id
                 h = User.joins(:groups).group('group_id').count
                 h.keys.each do |key|
                   h[key.to_i] = h.delete(key)
                 end
                 h
               end
             end

app/helpers/groups_helper.rb +4 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2014  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 GroupsHelper
               def group_settings_tabs(group)
                 tabs = []
                 tabs << {:name => 'general', :partial => 'groups/general', :label => :label_general}
                 tabs << {:name => 'users', :partial => 'groups/users', :label => :label_user_plural} if group.givable?
                 tabs << {:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural}
                 tabs
               end
               def render_principals_for_new_group_users(group)
                 scope = User.active.sorted.not_in_group(group).like(params[:q])
                 principal_count = scope.count
                 principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
                 principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).to_a
-                s = content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals')
+                s = content_tag('div',
+                  content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals'),
+                  :class => 'objects-selection'
+                )
                 links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
                   link_to text, autocomplete_for_user_group_path(group, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
                 }
                 s + content_tag('p', links, :class => 'pagination')
               end
             end

app/views/groups/_users.html.erb +2 -19

-            <div class="splitcontentleft">
+            <p><%= link_to l(:label_user_new), new_group_users_path(@group), :remote => true, :class => "icon icon-add" %></p>
             <% if @group.users.any? %>
               <table class="list users">
                 <thead><tr>
                   <th><%= l(:label_user) %></th>
                   <th style="width:15%"></th>
                 </tr></thead>
                 <tbody>
                 <% @group.users.sort.each do |user| %>
                   <tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
                     <td class="name"><%= link_to_user user %></td>
                     <td class="buttons">
                       <%= delete_link group_user_path(@group, :user_id => user), :remote => true %>
                     </td>
                   </tr>
                 <% end %>
                 </tbody>
               </table>
             <% else %>
               <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
-            </div>
-            <div class="splitcontentright">
-              <%= form_for(@group, :remote => true, :url => group_users_path(@group),
-                           :html => {:method => :post}) do |f| %>
-                <fieldset><legend><%=l(:label_user_new)%></legend>
-                <p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
-                <%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
-                <div id="users">
-                  <%= render_principals_for_new_group_users(@group) %>
-                </div>
-                <p><%= submit_tag l(:button_add) %></p>
-                </fieldset>
-              <% end %>
-            </div>

app/views/groups/add_users.js.erb +1 0

+            hideModal();
             $('#tab-content-users').html('<%= escape_javascript(render :partial => 'groups/users') %>');
             <% @users.each do |user| %>
               $('#user-<%= user.id %>').effect("highlight");
             <% end %>

config/routes.rb +3 -2

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             Rails.application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
               get 'account/activation_email', :to => 'account#activation_email', :as => 'activation_email'
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put, :patch]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put, :patch]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put, :patch]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put, :patch]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu', :via => [:get, :post]
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes', :via => :get
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt'
               get '/issues/gantt', :to => 'gantts#show'
               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
               get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
               get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users do
                 resources :memberships, :controller => 'principal_memberships'
               end
               post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
               delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new'
               post 'watchers', :to => 'watchers#create'
               post 'watchers/append', :to => 'watchers#append'
               delete 'watchers', :to => 'watchers#destroy'
               get 'watchers/autocomplete_for_user', :to => 'watchers#autocomplete_for_user'
               # Specific routes for issue watchers API
               post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
               delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
               resources :projects do
                 member do
                   get 'settings(/:tab)', :action => 'settings', :as => 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 shallow do
                   resources :memberships, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
                     collection do
                       get 'autocomplete'
                     end
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
                 resources :issues, :only => [:index, :new, :create]
                 # issue form update
                 match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :patch, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 get 'versions.:format', :to => 'versions#index'
                 get 'roadmap', :to => 'versions#index', :format => false
                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 shallow do
                   resources :issue_categories
                 end
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 shallow do
                   resources :repositories, :except => [:index, :show] do
                     member do
                       match 'committers', :via => [:get, :post]
                     end
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put, :patch]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
                 delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 shallow do
                   resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
                 end
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu, :via => [:get, :post]
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               get 'projects/:id/activity', :to => 'activities#index', :as => :project_activity
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
               get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
               get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
               get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 resources :memberships, :controller => 'principal_memberships'
                 member do
                   get 'autocomplete_for_user'
                 end
               end
-              match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
+              get 'groups/:id/users/new', :to => 'groups#new_users', :id => /\d+/, :as => 'new_group_users'
-              match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
+              post 'groups/:id/users', :to => 'groups#add_users', :id => /\d+/, :as => 'group_users'
+              delete 'groups/:id/users/:user_id', :to => 'groups#remove_user', :id => /\d+/, :as => 'group_user'
               resources :trackers, :except => :show do
                 collection do
                   match 'fields', :via => [:get, :post]
                 end
               end
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               match 'enumerations/:type', :to => 'enumerations#index', :via => :get
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection', :as => 'try_connection'
                 end
                 collection do
                   get 'autocomplete_for_new_user'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post], :as => 'plugin_settings'
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => [:get, :post]
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

test/functional/groups_controller_test.rb +12 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             require File.expand_path('../../test_helper', __FILE__)
             class GroupsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :groups_users
               def setup
                 @request.session[:user_id] = 1
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
               end
               def test_index_should_show_user_count
                 get :index
                 assert_response :success
                 assert_select 'tr#group-11 td.user_count', :text => '1'
               end
               def test_show
                 get :show, :id => 10
                 assert_response :success
                 assert_template 'show'
               end
               def test_show_invalid_should_return_404
                 get :show, :id => 99
                 assert_response 404
               end
               def test_new
                 get :new
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?]', 'group[name]'
               end
               def test_create
                 assert_difference 'Group.count' do
                   post :create, :group => {:name => 'New group'}
                 end
                 assert_redirected_to '/groups'
                 group = Group.order('id DESC').first
                 assert_equal 'New group', group.name
                 assert_equal [], group.users
               end
               def test_create_and_continue
                 assert_difference 'Group.count' do
                   post :create, :group => {:name => 'New group'}, :continue => 'Create and continue'
                 end
                 assert_redirected_to '/groups/new'
                 group = Group.order('id DESC').first
                 assert_equal 'New group', group.name
               end
               def test_create_with_failure
                 assert_no_difference 'Group.count' do
                   post :create, :group => {:name => ''}
                 end
                 assert_response :success
                 assert_template 'new'
               end
               def test_edit
                 get :edit, :id => 10
                 assert_response :success
                 assert_template 'edit'
                 assert_select 'div#tab-content-users'
                 assert_select 'div#tab-content-memberships' do
                   assert_select 'a', :text => 'Private child of eCookbook'
                 end
               end
               def test_update
                 new_name = 'New name'
                 put :update, :id => 10, :group => {:name => new_name}
                 assert_redirected_to '/groups'
                 group = Group.find(10)
                 assert_equal new_name, group.name
               end
               def test_update_with_failure
                 put :update, :id => 10, :group => {:name => ''}
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy
                 assert_difference 'Group.count', -1 do
                   post :destroy, :id => 10
                 end
                 assert_redirected_to '/groups'
               end
+              def test_new_users
+                get :new_users, :id => 10
+                assert_response :success
+                assert_template 'new_users'
+              end
+              def test_xhr_new_users
+                xhr :get, :new_users, :id => 10
+                assert_response :success
+                assert_equal 'text/javascript', response.content_type
+              end
               def test_add_users
                 assert_difference 'Group.find(10).users.count', 2 do
                   post :add_users, :id => 10, :user_ids => ['2', '3']
                 end
               end
               def test_xhr_add_users
                 assert_difference 'Group.find(10).users.count', 2 do
                   xhr :post, :add_users, :id => 10, :user_ids => ['2', '3']
                   assert_response :success
                   assert_template 'add_users'
                   assert_equal 'text/javascript', response.content_type
                 end
                 assert_match /John Smith/, response.body
               end
               def test_remove_user
                 assert_difference 'Group.find(10).users.count', -1 do
                   delete :remove_user, :id => 10, :user_id => '8'
                 end
               end
               def test_xhr_remove_user
                 assert_difference 'Group.find(10).users.count', -1 do
                   xhr :delete, :remove_user, :id => 10, :user_id => '8'
                   assert_response :success
                   assert_template 'remove_user'
                   assert_equal 'text/javascript', response.content_type
                 end
               end
               def test_autocomplete_for_user
                 xhr :get, :autocomplete_for_user, :id => 10, :q => 'smi', :format => 'js'
                 assert_response :success
                 assert_include 'John Smith', response.body
               end
             end

test/integration/routing/groups_test.rb +4 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             require File.expand_path('../../../test_helper', __FILE__)
             class RoutingGroupsTest < ActionDispatch::IntegrationTest
               def test_groups_resources
                 assert_routing(
                     { :method => 'get', :path => "/groups" },
                     { :controller => 'groups', :action => 'index' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups.xml" },
                     { :controller => 'groups', :action => 'index', :format => 'xml' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/groups" },
                     { :controller => 'groups', :action => 'create' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/groups.xml" },
                     { :controller => 'groups', :action => 'create', :format => 'xml' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups/new" },
                     { :controller => 'groups', :action => 'new' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups/1/edit" },
                     { :controller => 'groups', :action => 'edit', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups/1/autocomplete_for_user" },
                     { :controller => 'groups', :action => 'autocomplete_for_user', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups/1/autocomplete_for_user.js" },
                     { :controller => 'groups', :action => 'autocomplete_for_user', :id => '1', :format => 'js' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups/1" },
                     { :controller => 'groups', :action => 'show', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/groups/1.xml" },
                     { :controller => 'groups', :action => 'show', :id => '1', :format => 'xml' }
                   )
                 assert_routing(
                     { :method => 'put', :path => "/groups/1" },
                     { :controller => 'groups', :action => 'update', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'put', :path => "/groups/1.xml" },
                     { :controller => 'groups', :action => 'update', :id => '1', :format => 'xml' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/groups/1" },
                     { :controller => 'groups', :action => 'destroy', :id => '1' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/groups/1.xml" },
                     { :controller => 'groups', :action => 'destroy', :id => '1', :format => 'xml' }
                   )
               end
               def test_groups
                 assert_routing(
+                    { :method => 'get', :path => "/groups/567/users/new" },
+                    { :controller => 'groups', :action => 'new_users', :id => '567' }
+                  )
+                assert_routing(
                     { :method => 'post', :path => "/groups/567/users" },
                     { :controller => 'groups', :action => 'add_users', :id => '567' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/groups/567/users.xml" },
                     { :controller => 'groups', :action => 'add_users', :id => '567', :format => 'xml' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/groups/567/users/12" },
                     { :controller => 'groups', :action => 'remove_user', :id => '567', :user_id => '12' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/groups/567/users/12.xml" },
                     { :controller => 'groups', :action => 'remove_user', :id => '567', :user_id => '12', :format => 'xml' }
                   )
               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