jro_apps/redmine Commit - r3630:715c9d16ef2c

Refactor AuthSourcesController to support non-LDAP sources. #1131...

Eric Davis -

r3630:715c9d16ef2c

parent child

Context file:

r3630:715c9d16ef2c

Collapse all files

app/controllers/ldap_auth_sources_controller.rb created 644 +25 0

@@ -0,0 +1,25
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class LdapAuthSourcesController < AuthSourcesController
	19
	20	protected
	21
	22	def auth_source_class
	23	AuthSourceLdap
	24	end
	25	end

app/views/auth_sources/_form.html.erb created 644 +13 0

@@ -0,0 +1,13
	1	<%= error_messages_for 'auth_source' %>
	2
	3	<div class="box">
	4	<!--[form:auth_source]-->
	5	<p><label for="auth_source_name"><%=l(:field_name)%> <span class="required">*</span></label>
	6	<%= text_field 'auth_source', 'name' %></p>
	7
	8	<p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
	9	<%= check_box 'auth_source', 'onthefly_register' %></p>
	10	</div>
	11
	12	<!--[eoform:auth_source]-->
	13

test/functional/auth_sources_controller_test.rb created 644 +83 0

@@ -0,0 +1,83
	1	require 'test_helper'
	2
	3	class AuthSourcesControllerTest < ActionController::TestCase
	4	fixtures :all
	5
	6	def setup
	7	@request.session[:user_id] = 1
	8	end
	9
	10	context "get :index" do
	11	setup do
	12	get :index
	13	end
	14
	15	should_assign_to :auth_sources
	16	should_assign_to :auth_source_pages
	17	should_respond_with :success
	18	should_render_template :index
	19	end
	20
	21	context "get :new" do
	22	setup do
	23	get :new
	24	end
	25
	26	should_assign_to :auth_source
	27	should_respond_with :success
	28	should_render_template :new
	29
	30	should "initilize a new AuthSource" do
	31	assert_equal AuthSource, assigns(:auth_source).class
	32	assert assigns(:auth_source).new_record?
	33	end
	34	end
	35
	36	context "post :create" do
	37	setup do
	38	post :create, :auth_source => {:name => 'Test'}
	39	end
	40
	41	should_respond_with :redirect
	42	should_redirect_to("index") {{:action => 'index'}}
	43	should_set_the_flash_to /success/i
	44	end
	45
	46	context "get :edit" do
	47	setup do
	48	@auth_source = AuthSource.generate!(:name => 'TestEdit')
	49	get :edit, :id => @auth_source.id
	50	end
	51
	52	should_assign_to(:auth_source) {@auth_source}
	53	should_respond_with :success
	54	should_render_template :edit
	55	end
	56
	57	context "post :update" do
	58	setup do
	59	@auth_source = AuthSource.generate!(:name => 'TestEdit')
	60	post :update, :id => @auth_source.id, :auth_source => {:name => 'TestUpdate'}
	61	end
	62
	63	should_respond_with :redirect
	64	should_redirect_to("index") {{:action => 'index'}}
	65	should_set_the_flash_to /update/i
	66	end
	67
	68	context "post :destroy" do
	69	context "without users" do
	70	setup do
	71	@auth_source = AuthSource.generate!(:name => 'TestEdit')
	72	post :destroy, :id => @auth_source.id
	73	end
	74
	75	should_respond_with :redirect
	76	should_redirect_to("index") {{:action => 'index'}}
	77	should_set_the_flash_to /deletion/i
	78
	79	end
	80
	81	should "be tested with users"
	82	end
	83	end

test/functional/ldap_auth_sources_controller.rb created 644 +24 0

@@ -0,0 +1,24
	1	require 'test_helper'
	2
	3	class LdapAuthSourcesControllerTest < ActionController::TestCase
	4	fixtures :all
	5
	6	def setup
	7	@request.session[:user_id] = 1
	8	end
	9
	10	context "get :new" do
	11	setup do
	12	get :new
	13	end
	14
	15	should_assign_to :auth_source
	16	should_respond_with :success
	17	should_render_template :new
	18
	19	should "initilize a new AuthSource" do
	20	assert_equal AuthSourceLdap, assigns(:auth_source).class
	21	assert assigns(:auth_source).new_record?
	22	end
	23	end
	24	end

app/controllers/auth_sources_controller.rb +15 -7

             # 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
               # 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 }
+                     :redirect_to => { :template => :index }
               def index
-                @auth_source_pages, @auth_sources = paginate :auth_sources, :per_page => 10
+                @auth_source_pages, @auth_sources = paginate auth_source_class.name.tableize, :per_page => 10
-                render :action => "index", :layout => false if request.xhr?
+                render "auth_sources/index"
               end
               def new
-                @auth_source = AuthSourceLdap.new
+                @auth_source = auth_source_class.new
+                render 'auth_sources/new'
               end
               def create
-                @auth_source = AuthSourceLdap.new(params[:auth_source])
+                @auth_source = auth_source_class.new(params[:auth_source])
                 if @auth_source.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index'
                 else
-                  render :action => 'new'
+                  render 'auth_sources/new'
                 end
               end
               def edit
                 @auth_source = AuthSource.find(params[:id])
+                render 'auth_sources/edit'
               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 => 'index'
                 else
-                  render :action => 'edit'
+                  render 'auth_sources/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] = l(:error_unable_to_connect, text.message)
                 end
                 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 => 'index'
               end
+              protected
+              def auth_source_class
+                AuthSource
+              end
             end

app/views/admin/_menu.rhtml +1 0

             <div id="admin-menu">
             	<ul>
             		<li><%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %></li>
             		<li><%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %></li>
             		<li><%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %></li>
+                    <li><%= link_to l(:label_ldap_authentication), :controller => 'ldap_auth_sources', :action => 'index' %></li>
             		<li><%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %></li>
             		<li><%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %></li>
             		<li><%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %></li>
             		<li><%= link_to l(:label_workflow), {:controller => 'workflows', :action => 'edit'}, :class => 'workflows' %></li>
             		<li><%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %></li>
             		<li><%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %></li>
             		<li><%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %></li>
             		<% menu_items_for(:admin_menu) do |item| -%>
             			<li><%= link_to h(item.caption), item.url, item.html_options %></li>
             		<% end -%>
             		<li><%= link_to l(:label_plugins), {:controller => 'admin', :action => 'plugins'}, :class => 'plugins' %></li>
             		<li><%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info'}, :class => 'info' %></li>
             	</ul>
             </div>

app/views/ldap_auth_sources/_form.rhtml ~~app/views/auth_sources/_form.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/auth_sources/_form.rhtml to app/views/ldap_auth_sources/_form.rhtml

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 => 'index' %>
+                <%= link_to l(:label_ldap_authentication), :controller => 'ldap_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