jro_apps/redmine Commit - r2706:937823a0d849

Keep status filter on the projects list when un/archiving a project (#3530)....

Jean-Philippe Lang -

r2706:937823a0d849

parent child

Context file:

r2706:937823a0d849

Collapse all files

app/controllers/projects_controller.rb +2 -2

              # redMine - project management software
              # Copyright (C) 2006-2007  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
                menu_item :overview
                menu_item :activity, :only => :activity
                menu_item :roadmap, :only => :roadmap
                menu_item :files, :only => [:list_files, :add_file]
                menu_item :settings, :only => :settings
                menu_item :issues, :only => [:changelog]
                before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
                before_filter :find_optional_project, :only => :activity
                before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
                before_filter :authorize_global, :only => :add
                before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
                accept_key_auth :activity
                after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
                  if controller.request.post?
                    controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
                  end
                end
                helper :sort
                include SortHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issues
                helper IssuesHelper
                helper :queries
                include QueriesHelper
                helper :repositories
                include RepositoriesHelper
                include ProjectsHelper
                # Lists visible projects
                def index
                  respond_to do |format|
                    format.html {
                      @projects = Project.visible.find(:all, :order => 'lft')
                    }
                    format.atom {
                      projects = Project.visible.find(:all, :order => 'created_on DESC',
                                                            :limit => Setting.feeds_limit.to_i)
                      render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                    }
                  end
                end
                # Add a new project
                def add
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @project = Project.new(params[:project])
                  if request.get?
                    @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                    @project.trackers = Tracker.all
                    @project.is_public = Setting.default_projects_public?
                    @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                  else
                    @project.enabled_module_names = params[:enabled_modules]
                    if @project.save
                      @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
                      # Add current user as a project member if he is not admin
                      unless User.current.admin?
                        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                        m = Member.new(:user => User.current, :roles => [r])
                        @project.members << m
                      end
                      flash[:notice] = l(:notice_successful_create)
                      redirect_to :controller => 'projects', :action => 'settings', :id => @project
                    end
                  end
                end
                def copy
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @root_projects = Project.find(:all,
                                                :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                                :order => 'name')
                  if request.get?
                    @project = Project.copy_from(params[:id])
                    if @project
                      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                    else
                      redirect_to :controller => 'admin', :action => 'projects'
                    end
                  else
                    @project = Project.new(params[:project])
                    @project.enabled_module_names = params[:enabled_modules]
                    if @project.copy(params[:id])
                      flash[:notice] = l(:notice_successful_create)
                      redirect_to :controller => 'admin', :action => 'projects'
                    end
                  end
                end
                # Show @project
                def show
                  if params[:jump]
                    # try to redirect to the requested menu item
                    redirect_to_project_menu_item(@project, params[:jump]) && return
                  end
                  @users_by_role = @project.users_by_role
                  @subprojects = @project.children.visible
                  @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                  @trackers = @project.rolled_up_trackers
                  cond = @project.project_condition(Setting.display_subprojects_issues?)
                  @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                          :include => [:project, :status, :tracker],
                                                          :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                  @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                          :include => [:project, :status, :tracker],
                                                          :conditions => cond)
                  TimeEntry.visible_by(User.current) do
                    @total_hours = TimeEntry.sum(:hours,
                                                 :include => :project,
                                                 :conditions => cond).to_f
                  end
                  @key = User.current.rss_key
                end
                def settings
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @issue_category ||= IssueCategory.new
                  @member ||= @project.members.new
                  @trackers = Tracker.all
                  @repository ||= @project.repository
                  @wiki ||= @project.wiki
                end
                # Edit @project
                def edit
                  if request.post?
                    @project.attributes = params[:project]
                    if @project.save
                      @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
                      flash[:notice] = l(:notice_successful_update)
                      redirect_to :action => 'settings', :id => @project
                    else
                      settings
                      render :action => 'settings'
                    end
                  end
                end
                def modules
                  @project.enabled_module_names = params[:enabled_modules]
                  redirect_to :action => 'settings', :id => @project, :tab => 'modules'
                end
                def archive
                  @project.archive if request.post? && @project.active?
-                 redirect_to :controller => 'admin', :action => 'projects'
+                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
                end
                def unarchive
                  @project.unarchive if request.post? && !@project.active?
-                 redirect_to :controller => 'admin', :action => 'projects'
+                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
                end
                # Delete @project
                def destroy
                  @project_to_destroy = @project
                  if request.post? and params[:confirm]
                    @project_to_destroy.destroy
                    redirect_to :controller => 'admin', :action => 'projects'
                  end
                  # hide project in layout
                  @project = nil
                end
                # Add a new issue category to @project
                def add_issue_category
                  @category = @project.issue_categories.build(params[:category])
                  if request.post? and @category.save
                	  respond_to do |format|
                      format.html do
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to :action => 'settings', :tab => 'categories', :id => @project
                      end
                      format.js do
                        # IE doesn't support the replace_html rjs method for select box options
                        render(:update) {|page| page.replace "issue_category_id",
                          content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                        }
                      end
                    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', :tab => 'versions', :id => @project
                	end
                end
                def add_file
                  if request.post?
                    container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                    attachments = attach_files(container, params[:attachments])
                    if !attachments.empty? && Setting.notified_events.include?('file_added')
                      Mailer.deliver_attachments_added(attachments)
                    end
                    redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                    return
                  end
                  @versions = @project.versions.sort
                end
                def list_files
                  sort_init 'filename', 'asc'
                  sort_update 'filename' => "#{Attachment.table_name}.filename",
                              'created_on' => "#{Attachment.table_name}.created_on",
                              'size' => "#{Attachment.table_name}.filesize",
                              'downloads' => "#{Attachment.table_name}.downloads"
                  @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
                  @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                  render :layout => !request.xhr?
                end
                # Show changelog for @project
                def changelog
                  @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                  retrieve_selected_tracker_ids(@trackers)
                  @versions = @project.versions.sort
                end
                def roadmap
                  @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                  retrieve_selected_tracker_ids(@trackers)
                  @versions = @project.versions.sort
                  @versions = @versions.select {|v| !v.completed? } unless params[:completed]
                end
                def activity
                  @days = Setting.activity_days_default.to_i
                  if params[:from]
                    begin; @date_to = params[:from].to_date + 1; rescue; end
                  end
                  @date_to ||= Date.today + 1
                  @date_from = @date_to - @days
                  @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                  @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
                  @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                                           :with_subprojects => @with_subprojects,
                                                                           :author => @author)
                  @activity.scope_select {|t| !params["show_#{t}"].nil?}
                  @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
                  events = @activity.events(@date_from, @date_to)
                  respond_to do |format|
                    format.html {
                      @events_by_day = events.group_by(&:event_date)
                      render :layout => false if request.xhr?
                    }
                    format.atom {
                      title = l(:label_activity)
                      if @author
                        title = @author.name
                      elsif @activity.scope.size == 1
                        title = l("label_#{@activity.scope.first.singularize}_plural")
                      end
                      render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                    }
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                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 ActiveRecord::RecordNotFound
                  render_404
                end
                def find_optional_project
                  return true unless params[:id]
                  @project = Project.find(params[:id])
                  authorize
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def retrieve_selected_tracker_ids(selectable_trackers)
                  if ids = params[:tracker_ids]
                    @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                  else
                    @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                  end
                end
              end

app/views/admin/projects.rhtml +2 -2

              <div class="contextual">
              <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %>
              </div>
              <h2><%=l(:label_project_plural)%></h2>
              <% form_tag({}, :method => :get) do %>
              <fieldset><legend><%= l(:label_filter_plural) %></legend>
              <label><%= l(:field_status) %> :</label>
              <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
              <label><%= l(:label_project) %>:</label>
              <%= text_field_tag 'name', params[:name], :size => 30 %>
              <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
              </fieldset>
              <% end %>
              &nbsp;
              <table class="list">
                <thead><tr>
              	<th><%=l(:label_project)%></th>
              	<th><%=l(:field_description)%></th>
              	<th><%=l(:field_is_public)%></th>
              	<th><%=l(:field_created_on)%></th>
                <th></th>
                </tr></thead>
                <tbody>
              <% for project in @projects %>
                <tr class="<%= cycle("odd", "even") %> <%= css_project_classes(project) %>">
              	<td class="name" style="padding-left: <%= project.level %>em;"><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %></td>
              	<td><%= textilizable project.short_description, :project => project %></td>
              	<td align="center"><%= image_tag 'true.png' if project.is_public? %></td>
              	<td align="center"><%= format_date(project.created_on) %></td>
                <td class="buttons">
-                 <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
-                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
+                 <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
+                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
                  <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
                  <%= link_to(l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => 'icon icon-del') %>
                </td>
                </tr>
              <% end %>
                </tbody>
              </table>
              <% html_title(l(:label_project_plural)) -%>

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