jro_apps/redmine Files · app/controllers/journals_controller.rb

scm: git: performance improvements in fetching revisions (#8857, #9472)...

scm: git: performance improvements in fetching revisions (#8857, #9472) Parse a revision for a given branch, just if we haven't parsed it for any branches before. Moved the db check to for existing revisions into a grouped search. Search for many revisions at once: this reduces db load. Revisions are grouped into sets of 100. This is to improve memory consumption. There will be just one query instead of each 100. The above two methods significantly increase parsing speed. Test case was a git repo with 6000+ commits on a master branch, and several other branches originating for master. Speed improved from 1.4h to 18min. Contributed by Gergely Fábián. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9144 e93f8b46-1217-0410-a6f0-8f06a7374b81

Toshi MARUYAMA - - Load All Authors

File last commit:

r6763:db1ddd5509a0


                r9024:999a4ba30d7b

Download file

             journals_controller.rb
        
                    119 lines
            
             | 4.0 KiB
            
                | text/x-ruby
            
             |
                RubyLexer
            
             / app / controllers / journals_controller.rb
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
      # Redmine - project management software

      # Copyright (C) 2006-2011  Jean-Philippe Lang

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
      #

      # 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.

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
      #

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
      # 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.

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
      #

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
      # 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 JournalsController < ApplicationController

        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
        before_filter :find_journal, :only => [:edit, :diff]

        Eric Davis
    
Refactor: move IssuesController#reply to JournalsController...

              r3827
            
        before_filter :find_issue, :only => [:new]

        Eric Davis
    
Refactor: move IssuesController#changes to JournalsController#index....

              r3920
            
        before_filter :find_optional_project, :only => [:index]

        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
        before_filter :authorize, :only => [:new, :edit, :diff]

        Jean-Philippe Lang
    
Separation of RSS/API auth actions....

              r6077
            
        accept_rss_auth :index

        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
        menu_item :issues

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Eric Davis
    
Refactor: move IssuesController#changes to JournalsController#index....

              r3920
            
        helper :issues

        Jean-Philippe Lang
    
Fixed: error on JournalsController#index when custom fields are present (#7795)....

              r4901
            
        helper :custom_fields

        Eric Davis
    
Refactor: move IssuesController#changes to JournalsController#index....

              r3920
            
        helper :queries

        include QueriesHelper

        helper :sort

        include SortHelper

        def index

          retrieve_query

          sort_init 'id', 'desc'

          sort_update(@query.sortable_columns)

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Eric Davis
    
Refactor: move IssuesController#changes to JournalsController#index....

              r3920
            
          if @query.valid?

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
            @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",

        Eric Davis
    
Refactor: move IssuesController#changes to JournalsController#index....

              r3920
            
                                        :limit => 25)

          end

          @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)

          render :layout => false, :content_type => 'application/atom+xml'

        rescue ActiveRecord::RecordNotFound

          render_404

        end

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
        def diff

          @issue = @journal.issue

          if params[:detail_id].present?

            @detail = @journal.details.find_by_id(params[:detail_id])

          else

            @detail = @journal.details.detect {|d| d.prop_key == 'description'}

          end

          (render_404; return false) unless @issue && @detail

          @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)

        end

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Eric Davis
    
Refactor: move IssuesController#reply to JournalsController...

              r3827
            
        def new

          journal = Journal.find(params[:journal_id]) if params[:journal_id]

          if journal

            user = journal.user

            text = journal.notes

          else

            user = @issue.author

            text = @issue.description

          end

          # Replaces pre blocks with [...]

          text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')

          content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "

          content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Eric Davis
    
Refactor: move IssuesController#reply to JournalsController...

              r3827
            
          render(:update) { |page|

            page.<< "$('notes').value = \"#{escape_javascript content}\";"

            page.show 'update'

            page << "Form.Element.focus('notes');"

            page << "Element.scrollTo('update');"

            page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"

          }

        end

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
        def edit

        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
          (render_403; return false) unless @journal.editable_by?(User.current)

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
          if request.post?

            @journal.update_attributes(:notes => params[:notes]) if params[:notes]

        Jean-Philippe Lang
    
Added the following permissions (#527, #585, #627):...

              r1138
            
            @journal.destroy if @journal.details.empty? && @journal.notes.blank?

        Eric Davis
    
Added plugin hooks around Journal editing...

              r2119
            
            call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
            respond_to do |format|

              format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }

              format.js { render :action => 'update' }

            end

        Jean-Philippe Lang
    
Do not responde with javascript on regular requests....

              r4826
            
          else

            respond_to do |format|

              format.html {

                # TODO: implement non-JS journal update

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
                render :nothing => true

        Jean-Philippe Lang
    
Do not responde with javascript on regular requests....

              r4826
            
              }

              format.js

            end

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
          end

        end

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Jean-Philippe Lang
    
Keep track of issue description changes (#746)....

              r4834
            
        private

        Toshi MARUYAMA
    
remove trailing white-spaces from app/controllers/journals_controller.rb....

              r6763
            
        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
        def find_journal

          @journal = Journal.find(params[:id])

        Jean-Philippe Lang
    
Fixed: wiki and changeset links not displayed when previewing issue description or notes....

              r1124
            
          @project = @journal.journalized.project

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
        rescue ActiveRecord::RecordNotFound

          render_404

        end

        Eric Davis
    
Refactor: move IssuesController#reply to JournalsController...

              r3827
            
        # TODO: duplicated in IssuesController

        def find_issue

          @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])

          @project = @issue.project

        rescue ActiveRecord::RecordNotFound

          render_404

        end

        Jean-Philippe Lang
    
Administrators can edit issue notes....

              r1091
            
      end

	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

Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	# Redmine - project management software
		# Copyright (C) 2006-2011 Jean-Philippe Lang
Jean-Philippe Lang Administrators can edit issue notes....	r1091	#
		# 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.
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763	#
Jean-Philippe Lang Administrators can edit issue notes....	r1091	# 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.
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763	#
Jean-Philippe Lang Administrators can edit issue notes....	r1091	# 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 JournalsController < ApplicationController
Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	before_filter :find_journal, :only => [:edit, :diff]
Eric Davis Refactor: move IssuesController#reply to JournalsController...	r3827	before_filter :find_issue, :only => [:new]
Eric Davis Refactor: move IssuesController#changes to JournalsController#index....	r3920	before_filter :find_optional_project, :only => [:index]
Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	before_filter :authorize, :only => [:new, :edit, :diff]
Jean-Philippe Lang Separation of RSS/API auth actions....	r6077	accept_rss_auth :index
Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	menu_item :issues
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Eric Davis Refactor: move IssuesController#changes to JournalsController#index....	r3920	helper :issues
Jean-Philippe Lang Fixed: error on JournalsController#index when custom fields are present (#7795)....	r4901	helper :custom_fields
Eric Davis Refactor: move IssuesController#changes to JournalsController#index....	r3920	helper :queries
		include QueriesHelper
		helper :sort
		include SortHelper

		def index
		retrieve_query
		sort_init 'id', 'desc'
		sort_update(@query.sortable_columns)
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Eric Davis Refactor: move IssuesController#changes to JournalsController#index....	r3920	if @query.valid?
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763	@journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
Eric Davis Refactor: move IssuesController#changes to JournalsController#index....	r3920	:limit => 25)
		end
		@title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
		render :layout => false, :content_type => 'application/atom+xml'
		rescue ActiveRecord::RecordNotFound
		render_404
		end
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	def diff
		@issue = @journal.issue
		if params[:detail_id].present?
		@detail = @journal.details.find_by_id(params[:detail_id])
		else
		@detail = @journal.details.detect {\|d\| d.prop_key == 'description'}
		end
		(render_404; return false) unless @issue && @detail
		@diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
		end
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Eric Davis Refactor: move IssuesController#reply to JournalsController...	r3827	def new
		journal = Journal.find(params[:journal_id]) if params[:journal_id]
		if journal
		user = journal.user
		text = journal.notes
		else
		user = @issue.author
		text = @issue.description
		end
		# Replaces pre blocks with [...]
		text = text.to_s.strip.gsub(%r{<pre>((.\|\s)*?)</pre>}m, '[...]')
		content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
		content << text.gsub(/(\r?\n\|\r\n?)/, "\n> ") + "\n\n"
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Eric Davis Refactor: move IssuesController#reply to JournalsController...	r3827	render(:update) { \|page\|
		page.<< "$('notes').value = \"#{escape_javascript content}\";"
		page.show 'update'
		page << "Form.Element.focus('notes');"
		page << "Element.scrollTo('update');"
		page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
		}
		end
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Jean-Philippe Lang Administrators can edit issue notes....	r1091	def edit
Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	(render_403; return false) unless @journal.editable_by?(User.current)
Jean-Philippe Lang Administrators can edit issue notes....	r1091	if request.post?
		@journal.update_attributes(:notes => params[:notes]) if params[:notes]
Jean-Philippe Lang Added the following permissions (#527, #585, #627):...	r1138	@journal.destroy if @journal.details.empty? && @journal.notes.blank?
Eric Davis Added plugin hooks around Journal editing...	r2119	call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
Jean-Philippe Lang Administrators can edit issue notes....	r1091	respond_to do \|format\|
		format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
		format.js { render :action => 'update' }
		end
Jean-Philippe Lang Do not responde with javascript on regular requests....	r4826	else
		respond_to do \|format\|
		format.html {
		# TODO: implement non-JS journal update
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763	render :nothing => true
Jean-Philippe Lang Do not responde with javascript on regular requests....	r4826	}
		format.js
		end
Jean-Philippe Lang Administrators can edit issue notes....	r1091	end
		end
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Jean-Philippe Lang Keep track of issue description changes (#746)....	r4834	private
Toshi MARUYAMA remove trailing white-spaces from app/controllers/journals_controller.rb....	r6763
Jean-Philippe Lang Administrators can edit issue notes....	r1091	def find_journal
		@journal = Journal.find(params[:id])
Jean-Philippe Lang Fixed: wiki and changeset links not displayed when previewing issue description or notes....	r1124	@project = @journal.journalized.project
Jean-Philippe Lang Administrators can edit issue notes....	r1091	rescue ActiveRecord::RecordNotFound
		render_404
		end
Eric Davis Refactor: move IssuesController#reply to JournalsController...	r3827
		# TODO: duplicated in IssuesController
		def find_issue
		@issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
		@project = @issue.project
		rescue ActiveRecord::RecordNotFound
		render_404
		end
Jean-Philippe Lang Administrators can edit issue notes....	r1091	end