diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/users_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/users/index.rhtml | 2 | ||||
| -rw-r--r-- | app/views/users/new.html.erb (renamed from app/views/users/add.rhtml) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3fb11103d..1fd8347b7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -71,7 +71,7 @@ class UsersController < ApplicationController render_404 end - def add + def new @notification_options = User::MAIL_NOTIFICATION_OPTIONS @notification_option = Setting.default_notification_option @@ -100,14 +100,14 @@ class UsersController < ApplicationController 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'} : + redirect_to(params[:continue] ? {:controller => 'users', :action => 'new'} : {:controller => 'users', :action => 'edit', :id => @user}) return else @auth_sources = AuthSource.find(:all) @notification_option = @user.mail_notification - render :action => 'add' + render :action => 'new' end end diff --git a/app/views/users/index.rhtml b/app/views/users/index.rhtml index 1b4702872..804678959 100644 --- a/app/views/users/index.rhtml +++ b/app/views/users/index.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %> +<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_user_plural)%></h2> diff --git a/app/views/users/add.rhtml b/app/views/users/new.html.erb index 0e7a33319..0e7a33319 100644 --- a/app/views/users/add.rhtml +++ b/app/views/users/new.html.erb |