deface added, overrides for _show_all_issues @ project page added to …

…prevent filtering issues

app/overrides/projects/show.rb

@@ -0,0 +1,5 @@
+Deface::Override.new :virtual_path  => 'projects/show',
+                     :original      => 'projects_page_deface',
+                     :name          => 'replace-view-issues-link',
+                     :replace    => "code[erb-loud]:contains('l(:label_issue_view_all)')",
+                     :text		=> "<%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project %>"

init.rb

@@ -1,6 +1,9 @@
-require_dependency 'hooks'
+#require_dependency 'hooks'
+Rails.application.paths["app/overrides"] ||= []
+Rails.application.paths["app/overrides"] << File.expand_path("../app/overrides", __FILE__)
 
-ActionDispatch::Callbacks.to_prepare do
+RedmineApp::Application.config.after_initialize do
+	require 'hooks'
 	IssuesController.send(:include, ExtendedIssuesController) unless IssuesController.include?(ExtendedIssuesController)
 	IssueStatusesController.send(:include, ExtendedIssueStatusesController) unless IssueStatusesController.include?(ExtendedIssueStatusesController)
 	JournalObserver.send(:include, ExtendedJournalObserver) unless JournalObserver.include?(ExtendedJournalObserver)
@@ -11,7 +14,10 @@
 	QueriesController.send(:include, ExtendedQueriesController) unless QueriesController.include?(ExtendedQueriesController)
 	QueriesHelper.send(:include, ExtendedQueriesHelper) unless QueriesHelper.include?(ExtendedQueriesHelper)
 	ProjectsHelper.send(:include, ExtendedProjectsHelper) unless ProjectsHelper.include?(ExtendedProjectsHelper)
-end
+end	
+# ActionDispatch::Callbacks.to_prepare do
+
+# end
 version = `git describe --always`
 Redmine::Plugin.register :redmine_requests do
   name 'Pot Requests plugin'
@@ -20,4 +26,5 @@
   version version
   url ''
   author_url 'http://primepress.ru'
+  requires_redmine :version_or_higher => '2.1.0'
 end

lib/hooks.rb

@@ -172,26 +172,19 @@ def self.included(base)
     base.module_eval do
       def retrieve_query
         if !params[:query_id].blank?
-          #cond = "project_id IS NULL"
-          #cond = "project_id = #{@project.id}" if @project
           @query = Query.find(params[:query_id])
-        raise ::Unauthorized unless @query.visible?
-          #@query.project = @project
-          session[:query] = {:id => @query.id}
+          raise ::Unauthorized unless @query.visible?
           sort_clear
-        elsif api_request? || session[:query].nil?
-          #updated query for projects with defaults query specified
-          @query = Query.includes(:project).where(:default => true, :project_id => @project.id).first
-          session[:query] = { :id => @query.id, :project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
-        elsif params[:f] || params[:fields] 
-          @query = Query.new(:name => "_")
+        elsif params[:set_filter]
+          @query = Query.new(:name => '_')
           @query.project = @project
           build_query_from_params
         else
-          # retrieve from session
-          @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
-          @query ||= Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
-          @query.project = @project
+          logger.debug "1__________"
+          @query = Query.includes(:project).where(:default => true, :project_id => @project.id).first
+          #@query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
+          #@query ||= Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
+          #@query.project = @project
         end
       end
     end