"queries" branch merged

git-svn-id: http://redmine.rubyforge.org/svn/trunk@95 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 115 insertions, 21 deletions

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 3bebf4de5..45c3206ce 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -71,9 +71,9 @@ class ApplicationController < ActionController::Base
   end

 

   # authorizes the user for the requested action.

-  def authorize

+  def authorize(ctrl = @params[:controller], action = @params[:action])

     # check if action is allowed on public projects

-    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ]

+    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]

       return true

     end    

     # if action is not public, force login

@@ -82,7 +82,7 @@ class ApplicationController < ActionController::Base
     return true if self.logged_in_user.admin?

     # if not admin, check membership permission    

     @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])    

-    if @user_membership and Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], @user_membership.role_id )    

+    if @user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], @user_membership.role_id )    

       return true		

     end		

     render :nothing => true, :status => 403

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ada0f3795..08b5e0b81 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -16,19 +16,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 

 class ProjectsController < ApplicationController

-  layout 'base', :except => :export_issues_pdf

+  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	

+  include SortHelper

   helper :custom_fields

   include CustomFieldsHelper   

   helper :ifpdf

   include IfpdfHelper

   helper IssuesHelper

+  helper :queries

+  include QueriesHelper

   

   def index
     list
@@ -208,8 +208,7 @@ class ProjectsController < ApplicationController
     sort_init 'issues.id', 'desc'

     sort_update

 

-    search_filter_init_list_issues

-    search_filter_update if params[:set_filter]

+    retrieve_query

 

     @results_per_page_options = [ 15, 25, 50, 100 ]

     if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i

@@ -219,14 +218,15 @@ class ProjectsController < ApplicationController
       @results_per_page = session[:results_per_page] || 25

     end

 

-    @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)		

-    @issue_pages = Paginator.new self, @issue_count, @results_per_page, @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						

-    

+    if @query.valid?

+      @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)		

+      @issue_pages = Paginator.new self, @issue_count, @results_per_page, @params['page']								

+      @issues = Issue.find :all, :order => sort_clause,

+  						:include => [ :author, :status, :tracker, :project ],

+  						:conditions => @query.statement,

+  						:limit  =>  @issue_pages.items_per_page,

+  						:offset =>  @issue_pages.current.offset						

+    end

     render :layout => false if request.xhr?

   end

 

@@ -235,11 +235,12 @@ class ProjectsController < ApplicationController
     sort_init 'issues.id', 'desc'

     sort_update

 

-    search_filter_init_list_issues

+    retrieve_query

+    render :action => 'list_issues' and return unless @query.valid?

 					

     @issues =  Issue.find :all, :order => sort_clause,

 						:include => [ :author, :status, :tracker, :project, :custom_values ],

-						:conditions => search_filter_clause							

+						:conditions => @query.statement				

 

     ic = Iconv.new('ISO-8859-1', 'UTF-8')    

     export = StringIO.new

@@ -268,14 +269,16 @@ class ProjectsController < ApplicationController
     sort_init 'issues.id', 'desc'

     sort_update

 

-    search_filter_init_list_issues

+    retrieve_query

+    render :action => 'list_issues' and return unless @query.valid?

 					

     @issues =  Issue.find :all, :order => sort_clause,

 						:include => [ :author, :status, :tracker, :project, :custom_values ],

-						:conditions => search_filter_clause

+						:conditions => @query.statement

 											

     @options_for_rfpdf ||= {}

     @options_for_rfpdf[:file_name] = "export.pdf"

+    render :layout => false

   end

 

   def move_issues

@@ -302,6 +305,22 @@ class ProjectsController < ApplicationController
     end

   end

 

+  def add_query

+    @query = Query.new(params[:query])

+    @query.project = @project

+    @query.user = logged_in_user

+    

+    params[:fields].each do |field|

+      @query.add_filter(field, params[:operators][field], params[:values][field])

+    end if params[:fields]

+    

+    if request.post? and @query.save

+      flash[:notice] = l(:notice_successful_create)

+      redirect_to :controller => 'reports', :action => 'issue_report', :id => @project

+    end    

+    render :layout => false if request.xhr?

+  end

+

   # Add a news to @project

   def add_news

     @news = News.new(:project => @project)

@@ -471,4 +490,29 @@ private
   rescue
     redirect_to :action => 'list'			

   end

+  

+  # Retrieve query from session or build a new query

+  def retrieve_query

+    if params[:query_id]

+      @query = @project.queries.find(params[:query_id])

+    else

+      if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id

+        # Give it a name, required to be valid

+        @query = Query.new(:name => "_")

+        @query.project = @project

+        if params[:fields] and params[:fields].is_a? Array

+          params[:fields].each do |field|

+            @query.add_filter(field, params[:operators][field], params[:values][field])

+          end

+        else

+          @query.available_filters.keys.each do |field|

+            @query.add_short_filter(field, params[field]) if params[field]

+          end

+        end

+        session[:query] = @query

+      else

+        @query = session[:query]

+      end

+    end  

+  end

 end
diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
new file mode 100644
index 000000000..4bdd8aaa2
--- /dev/null
+++ b/app/controllers/queries_controller.rb
@@ -0,0 +1,49 @@
+# 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 QueriesController < ApplicationController
+  layout 'base'
+  before_filter :require_login, :find_query
+
+  def edit
+    if request.post?
+      @query.filters = {}
+      params[:fields].each do |field|
+        @query.add_filter(field, params[:operators][field], params[:values][field])
+      end if params[:fields]
+      @query.attributes = params[:query]
+          
+      if @query.save
+        flash[:notice] = l(:notice_successful_update)
+        redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
+      end
+    end
+  end
+
+  def destroy
+    @query.destroy if request.post?
+    redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
+  end
+  
+private
+  def find_query
+    @query = Query.find(params[:id])
+    @project = @query.project
+    # check if user is allowed to manage queries (same permission as add_query)
+    authorize('projects', 'add_query')
+  end
+end
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 985c937fc..c10929d5b 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -48,6 +48,7 @@ class ReportsController < ApplicationController
       @report_title = l(:field_author)

       render :template => "reports/issue_report_details"  

     else

+      @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]

       @trackers = Tracker.find(:all)

       @priorities = Enumeration::get_values('IPRI')

       @categories = @project.issue_categories