jro_apps/redmine Commit - r3322:c5f30fde2872

Refactor: Merged AuthSourcesController#list and #index...

Eric Davis -

r3322:c5f30fde2872

parent child

Context file:

r3322:c5f30fde2872

Collapse all files

app/controllers/auth_sources_controller.rb +6 -11

             # 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 AuthSourcesController < ApplicationController
               layout 'admin'
               before_filter :require_admin
-              def index
-                list
-                render :action => 'list' unless request.xhr?
-              end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :action => :list }
-              def list
+              def index
                 @auth_source_pages, @auth_sources = paginate :auth_sources, :per_page => 10
-                render :action => "list", :layout => false if request.xhr?
+                render :action => "index", :layout => false if request.xhr?
               end
               def new
                 @auth_source = AuthSourceLdap.new
               end
               def create
                 @auth_source = AuthSourceLdap.new(params[:auth_source])
                 if @auth_source.save
                   flash[:notice] = l(:notice_successful_create)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @auth_source = AuthSource.find(params[:id])
               end
               def update
                 @auth_source = AuthSource.find(params[:id])
                 if @auth_source.update_attributes(params[:auth_source])
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                 else
                   render :action => 'edit'
                 end
               end
               def test_connection
                 @auth_method = AuthSource.find(params[:id])
                 begin
                   @auth_method.test_connection
                   flash[:notice] = l(:notice_successful_connection)
                 rescue => text
                   flash[:error] = "Unable to connect (#{text})"
                 end
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               end
               def destroy
                 @auth_source = AuthSource.find(params[:id])
                 unless @auth_source.users.find(:first)
                   @auth_source.destroy
                   flash[:notice] = l(:notice_successful_delete)
                 end
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               end
             end

app/views/auth_sources/index.html.erb ~~app/views/auth_sources/list.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/auth_sources/list.rhtml to app/views/auth_sources/index.html.erb

app/views/settings/_authentication.rhtml +1 -1

             <% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
             <div class="box tabular settings">
             <p><%= setting_check_box :login_required %></p>
             <p><%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %></p>
             <p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
             							                             [l(:label_registration_activation_by_email), "1"],
             							                             [l(:label_registration_manual_activation), "2"],
             							                             [l(:label_registration_automatic_activation), "3"]] %></p>
             <p><%= setting_text_field :password_min_length, :size => 6 %></p>
             <p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
             <p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
             <p><%= setting_check_box :rest_api_enabled %></p>
             </div>
             <div style="float:right;">
-                <%= link_to l(:label_ldap_authentication), :controller => 'auth_sources', :action => 'list' %>
+                <%= link_to l(:label_ldap_authentication), :controller => 'auth_sources', :action => 'index' %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% 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