jro_apps/redmine Commit - r31:6a0022d7a146

ajaxified paginators...

Jean-Philippe Lang -

r31:6a0022d7a146

parent child

Context file:

r31:6a0022d7a146

Collapse all files

redmine/app/controllers/admin_controller.rb +2 0

             # 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 AdminController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
               end
               def projects
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
+                render :action => "projects", :layout => false if request.xhr?
               end
               def mail_options
                 @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
                 if request.post?
                   @actions.each { |a|
                     a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s
                     a.save
                   }
                   flash.now[:notice] = l(:notice_successful_update)
                 end
               end
               def info
                 @adapter_name = ActiveRecord::Base.connection.adapter_name
               end
             end

redmine/app/controllers/auth_sources_controller.rb +2 -1

             # 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 'base'
               before_filter :require_admin
               def index
                 list
-                render :action => '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
                 @auth_source_pages, @auth_sources = paginate :auth_sources, :per_page => 10
+                render :action => "list", :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'
                 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'
                 else
                   render :action => 'edit'
                 end
               end
               def test_connection
                 @auth_method = AuthSource.find(params[:id])
                 begin
                   @auth_method.test_connection
                 rescue => text
                   flash[:notice] = text
                 end
                 flash[:notice] ||= l(:notice_successful_connection)
                 redirect_to :action => 'list'
               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'
               end
             end

redmine/app/controllers/custom_fields_controller.rb +2 -1

             # 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 CustomFieldsController < ApplicationController
               layout 'base'
               before_filter :require_admin
               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 @custom_field_pages, @custom_fields = paginate :custom_fields, :per_page => 15
+                render :action => "list", :layout => false if request.xhr?
               end
               def new
                 case params[:type]
                   when "IssueCustomField"
                     @custom_field = IssueCustomField.new(params[:custom_field])
                     @custom_field.trackers = Tracker.find(params[:tracker_ids]) if params[:tracker_ids]
                   when "UserCustomField"
                     @custom_field = UserCustomField.new(params[:custom_field])
                   when "ProjectCustomField"
                     @custom_field = ProjectCustomField.new(params[:custom_field])
                   else
                     redirect_to :action => 'list'
                     return
                 end
                 if request.post? and @custom_field.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find(:all)
               end
               def edit
                 @custom_field = CustomField.find(params[:id])
                 if request.post? and @custom_field.update_attributes(params[:custom_field])
                   if @custom_field.is_a? IssueCustomField
                     @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @trackers = Tracker.find(:all)
               end
               def destroy
                 CustomField.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete custom field"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/issue_statuses_controller.rb +2 -1

             # 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 IssueStatusesController < ApplicationController
             	layout 'base'
             	before_filter :require_admin
               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @issue_status = IssueStatus.new
               end
               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
                 if @issue_status.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @issue_status = IssueStatus.find(params[:id])
               end
               def update
                 @issue_status = IssueStatus.find(params[:id])
                 if @issue_status.update_attributes(params[:issue_status])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 IssueStatus.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete issue status"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/projects_controller.rb +7 -2

             # 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 ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
+                render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children_count > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all)
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField::find_all
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find_all
                 @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
                 @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if @project.update_attributes(params[:project])
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_documents', :id => @project
                   end
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Create the document if a file was sent
                   if params[:attachment][:file].size > 0
                     @attachment = @issue.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
-                search_filter_update if params[:set_filter] or request.post?
+                search_filter_update if params[:set_filter]
                 @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
                 @issues = Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
+                render :action => "list_issues", :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause
                 export = StringIO.new
                 CSV::Writer.generate(export, ',') do |csv|
                   csv << %w(Id Status Tracker Subject Author Created Updated)
                   @issues.each do |issue|
                     csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                   end
                 end
                 export.rewind
                 send_data(export.read,
                   :type => 'text/csv; charset=utf-8; header=present',
                   :filename => 'export.csv')
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :action => 'list_issues', :id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role_id)}
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? and params[:new_project_id] and params[:new_tracker_id]
                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
                     # category is project dependent
                     i.category = nil unless i.project_id == new_project.id
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker
                     i.save
                   }
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list_issues', :id => @project
                 end
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
+                render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
                   :order => "versions.effective_date DESC, issues.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/roles_controller.rb +2 -1

             # 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 RolesController < ApplicationController
             	layout 'base'
             	before_filter :require_admin
               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @role = Role.new(params[:role])
                 if request.post?
                   @role.permissions = Permission.find(@params[:permission_ids]) if @params[:permission_ids]
                   if @role.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(@params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def destroy
                 @role = Role.find(params[:id])
                 unless @role.members.empty?
                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
                 else
                   @role.destroy
                 end
                 redirect_to :action => 'list'
               end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = l(:notice_successful_update)
                   end
                 end
                 @roles = Role.find_all
                 @trackers = Tracker.find_all
                 @statuses = IssueStatus.find(:all, :include => :workflows)
               end
             end

redmine/app/controllers/trackers_controller.rb +2 -1

             # 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 TrackersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               def index
                 list
-                render :action => '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 ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10
+                render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @tracker = Tracker.new(params[:tracker])
                 if request.post? and @tracker.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
               end
               def edit
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
               def destroy
                 @tracker = Tracker.find(params[:id])
                 unless @tracker.issues.empty?
                   flash[:notice] = "This tracker contains issues and can\'t be deleted."
                 else
                   @tracker.destroy
                 end
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/users_controller.rb +3 -1

             # 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 UsersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
-                render :action => 'list'
+                render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @user_count = User.count
                 @user_pages = Paginator.new self, @user_count,
 ,
             								@params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
+                render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => $RDM_DEFAULT_LANG)
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                 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]
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                   @user.custom_values = @custom_values
                   if @user.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
               end
               def edit
                 @user = User.find(params[:id])
                 if request.get?
                   @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 else
                   @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?
                   if params[:custom_fields]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                   end
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'list'
                   end
                 end
               end
               def destroy
                 User.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete user"
                 redirect_to :action => 'list'
               end
             end

redmine/app/helpers/application_helper.rb +13 -3

             # 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.
             module ApplicationHelper
               # Return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # Return true if user is logged in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime(time) if time
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html = ''
-                html << link_to(('&#171; ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
+                html << link_to_remote(('&#171; ' + l(:label_previous)),
-                html << (pagination_links(paginator, options, html_options) || '')
+                                        {:update => "content", :url => { :page => paginator.current.previous }},
-                html << ' ' + link_to((l(:label_next) + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
+                                        {:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
+                html << (pagination_links_each(paginator, options) do |n|
+                  link_to_remote(n.to_s,
+                                  {:url => {:action => 'list', :params => @params.merge({:page => n})}, :update => 'content'},
+                                  {:href => url_for(:action => 'list', :params => @params.merge({:page => n}))})
+                end || '')
+                html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
+                                             {:update => "content", :url => { :page => paginator.current.next }},
+                                             {:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.next}))}) if paginator.current.next
                 html
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select
                 (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html].store :class, "tabular"
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def calendar_for(field_id)
                 image_tag("calendar", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
             end
             class TabularFormBuilder < ActionView::Helpers::FormBuilder
               include GLoc
               def initialize(object_name, object, template, options, proc)
                 set_language_if_valid options.delete(:lang)
                 @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
               end
               (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                   label = @template.content_tag("label", label_text,
                                 :class => (@object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

redmine/app/helpers/sort_helper.rb +4 -1

             # Helpers to sort tables using clickable column headers.
             #
             # Author:  Stuart Rackham <srackham@methods.co.nz>, March 2005.
             # License: This source code is released under the MIT license.
             #
             # - Consecutive clicks toggle the column's sort order.
             # - Sort state is maintained by a session hash entry.
             # - Icon image identifies sort column and state.
             # - Typically used in conjunction with the Pagination module.
             #
             # Example code snippets:
             #
             # Controller:
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @items = Contact.find_all nil, sort_clause
             #   end
             #
             # Controller (using Pagination module):
             #
             #   helper :sort
             #   include SortHelper
             #
             #   def list
             #     sort_init 'last_name'
             #     sort_update
             #     @contact_pages, @items = paginate :contacts,
             #       :order_by => sort_clause,
             #       :per_page => 10
             #   end
             #
             # View (table header in list.rhtml):
             #
             #   <thead>
             #     <tr>
             #       <%= sort_header_tag('id', :title => 'Sort by contact ID') %>
             #       <%= sort_header_tag('last_name', :caption => 'Name') %>
             #       <%= sort_header_tag('phone') %>
             #       <%= sort_header_tag('address', :width => 200) %>
             #     </tr>
             #   </thead>
             #
             # - The ascending and descending sort icon images are sort_asc.png and
             #   sort_desc.png and reside in the application's images directory.
             # - Introduces instance variables: @sort_name, @sort_default.
             # - Introduces params :sort_key and :sort_order.
             #
             module SortHelper
               # Initializes the default sort column (default_key) and sort order
               # (default_order).
               #
               # - default_key is a column attribute name.
               # - default_order is 'asc' or 'desc'.
               # - name is the name of the session hash entry that stores the sort state,
               #   defaults to '<controller_name>_sort'.
               #
               def sort_init(default_key, default_order='asc', name=nil)
                 @sort_name = name || @params[:controller] + @params[:action] + '_sort'
                 @sort_default = {:key => default_key, :order => default_order}
               end
               # Updates the sort state. Call this in the controller prior to calling
               # sort_clause.
               #
               def sort_update()
                 if @params[:sort_key]
                   sort = {:key => @params[:sort_key], :order => @params[:sort_order]}
                 elsif @session[@sort_name]
                   sort = @session[@sort_name]   # Previous sort.
                 else
                   sort = @sort_default
                 end
                 @session[@sort_name] = sort
               end
               # Returns an SQL sort clause corresponding to the current sort state.
               # Use this to sort the controller's table items collection.
               #
               def sort_clause()
                 @session[@sort_name][:key] + ' ' + @session[@sort_name][:order]
               end
               # Returns a link which sorts by the named column.
               #
               # - column is the name of an attribute in the sorted record collection.
               # - The optional caption explicitly specifies the displayed link text.
               # - A sort icon image is positioned to the right of the sort link.
               #
               def sort_link(column, caption=nil)
                 key, order = @session[@sort_name][:key], @session[@sort_name][:order]
                 if key == column
                   if order.downcase == 'asc'
                     icon = 'sort_asc'
                     order = 'desc'
                   else
                     icon = 'sort_desc'
                     order = 'asc'
                   end
                 else
                   icon = nil
                   order = 'desc' # changed for desc order by default
                 end
                 caption = titleize(Inflector::humanize(column)) unless caption
                 params = {:params => {:sort_key => column, :sort_order => order}}
-                link_to(caption, params) + (icon ? nbsp(2) + image_tag(icon) : '')
+                link_to_remote(caption,
+                              {:update => "content", :url => { :sort_key => column, :sort_order => order}},
+                              {:href => url_for(:params => { :sort_key => column, :sort_order => order})}) +
+                (icon ? nbsp(2) + image_tag(icon) : '')
               end
               # Returns a table header <th> tag with a sort link for the named column
               # attribute.
               #
               # Options:
               #   :caption     The displayed link name (defaults to titleized column name).
               #   :title       The tag's 'title' attribute (defaults to 'Sort by :caption').
               #
               # Other options hash entries generate additional table header tag attributes.
               #
               # Example:
               #
               #   <%= sort_header_tag('id', :title => 'Sort by contact ID', :width => 40) %>
               #
               # Renders:
               #
               #   <th title="Sort by contact ID" width="40">
               #     <a href="/contact/list?sort_order=desc&amp;sort_key=id">Id</a>
               #     &nbsp;&nbsp;<img alt="Sort_asc" src="/images/sort_asc.png" />
               #   </th>
               #
               def sort_header_tag(column, options = {})
                 if options[:caption]
                   caption = options[:caption]
                   options.delete(:caption)
                 else
                   caption = titleize(Inflector::humanize(column))
                 end
                 options[:title]= "Sort by #{caption}" unless options[:title]
                 content_tag('th', sort_link(column, caption), options)
               end
               private
                 # Return n non-breaking spaces.
                 def nbsp(n)
                   '&nbsp;' * n
                 end
                 # Return capitalized title.
                 def titleize(title)
                   title.split.map {|w| w.capitalize }.join(' ')
                 end
             end

redmine/app/views/auth_sources/list.rhtml +5 -5

             <h2><%=l(:label_auth_source_plural)%></h2>
             <table class="listTableContent">
               <tr class="ListHead">
-              <td><%=l(:field_name)%></td>
+            	  <th><%=l(:field_name)%></th>
-              <td><%=l(:field_type)%></td>
+            	  <th><%=l(:field_type)%></th>
-              <td><%=l(:field_host)%></td>
+            	  <th><%=l(:field_host)%></th>
-              <td></td>
+            	  <th></th>
-              <td></td>
+            	  <th></th>
               </tr>
             <% for source in @auth_sources %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td><%= link_to source.name, :action => 'edit', :id => source%></td>
                 <td align="center"><%= source.auth_method_name %></td>
                 <td align="center"><%= source.host %></td>
                 <td align="center">
                     <%= link_to l(:button_test), :action => 'test_connection', :id => source %>
                 </td>
                 <td align="center">
                     <%= button_to l(:button_delete), { :action => 'destroy', :id => source }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
                 </td>
                 </tr>
             <% end %>
             </table>
             <%= pagination_links_full @auth_source_pages %>
             <br />
             <%= link_to '&#187; ' + l(:label_auth_source_new), :action => 'new' %>

redmine/app/views/projects/list_issues.rhtml +6 -6

             <h2><%=l(:label_issue_plural)%></h2>
             <form method="post" class="noborder">
             <table cellpadding=2>
               <tr>
                 <td><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
                 <td><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
                 <td><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
                 <td><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
                 <td><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
                 <td><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
                 <td><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
                 <td valign="bottom">
+                  <%= hidden_field_tag 'set_filter', 1 %>
                   <%= submit_tag l(:button_apply), :class => 'button-small' %>
-                  <%= end_form_tag %>
+                </td>
+                <td valign="bottom">
-                  <%= start_form_tag %>
+                  <%= link_to l(:button_clear), :action => 'list_issues', :id => @project, :set_filter => 1 %>
-                  <%= submit_tag l(:button_clear), :class => 'button-small' %>
-                  <%= end_form_tag %>
                 </td>
               </tr>
             </table>
+            <%= end_form_tag %>
              &nbsp;
             <%= start_form_tag ({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) %>
             <table class="listTableContent">
                 <tr>
                 <td colspan="6" align="left"><small><%= check_all_links 'issues_form' %></small></td>
                 <td colspan="2" align="right"><small><%= link_to l(:label_export_csv), :action => 'export_issues_csv', :id => @project.id %></small></td>
                 </tr>
                 <tr class="ListHead">
                     <td></td>
             		<%= sort_header_tag('issues.id', :caption => '#') %>
             		<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
             		<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
             		<th><%=l(:field_subject)%></th>
             		<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
             		<%= sort_header_tag('issues.created_on', :caption => l(:field_created_on)) %>
             		<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
             	</tr>
             	<% for issue in @issues %>
             	<tr bgcolor="#<%= issue.status.html_color %>">
             	    <td width="15"><%= check_box_tag "issue_ids[]", issue.id %></td>
             		<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.status.name %></td>
             		<td align="center"><%= issue.tracker.name %></td>
             		<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.author.display_name %></td>
             		<td align="center"><%= format_time(issue.created_on) %></td>
             		<td align="center"><%= format_time(issue.updated_on) %></td>
             	</tr>
             	<% end %>
             </table>
             <p>
             <%= pagination_links_full @issue_pages %>
             [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
             </p>
             <%= submit_tag l(:button_move) %>
             <%= end_form_tag %>

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