jro_apps/redmine Commit - r4901:334132289ca9

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

Jean-Philippe Lang -

r4901:334132289ca9

parent child

Context file:

r4901:334132289ca9

Collapse all files

app/controllers/journals_controller.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 JournalsController < ApplicationController
               before_filter :find_journal, :only => [:edit, :diff]
               before_filter :find_issue, :only => [:new]
               before_filter :find_optional_project, :only => [:index]
               before_filter :authorize, :only => [:new, :edit, :diff]
               accept_key_auth :index
               menu_item :issues
               helper :issues
+              helper :custom_fields
               helper :queries
               include QueriesHelper
               helper :sort
               include SortHelper
               def index
                 retrieve_query
                 sort_init 'id', 'desc'
                 sort_update(@query.sortable_columns)
                 if @query.valid?
                   @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
                                               :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
               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
               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"
                 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
               def edit
                 (render_403; return false) unless @journal.editable_by?(User.current)
                 if request.post?
                   @journal.update_attributes(:notes => params[:notes]) if params[:notes]
                   @journal.destroy if @journal.details.empty? && @journal.notes.blank?
                   call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
                   respond_to do |format|
                     format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
                     format.js { render :action => 'update' }
                   end
                 else
                   respond_to do |format|
                     format.html {
                       # TODO: implement non-JS journal update
                       render :nothing => true
                     }
                     format.js
                   end
                 end
               end
               private
               def find_journal
                 @journal = Journal.find(params[:id])
                 @project = @journal.journalized.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # 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
             end

test/fixtures/journal_details.yml +7 0

             ---
             journal_details_001:
               old_value: "1"
               property: attr
               id: 1
               value: "2"
               prop_key: status_id
               journal_id: 1
             journal_details_002:
               old_value: "40"
               property: attr
               id: 2
               value: "30"
               prop_key: done_ratio
               journal_id: 1
             journal_details_003:
               old_value: nil
               property: attr
               id: 3
               value: "6"
               prop_key: fixed_version_id
               journal_id: 4
             journal_details_004:
               old_value: "This word was removed and an other was"
               property: attr
               id: 4
               value: "This word was and an other was added"
               prop_key: description
               journal_id: 3
+            journal_details_005:
+              old_value: Old value
+              property: cf
+              id: 5
+              value: New value
+              prop_key: 2
+              journal_id: 3

test/functional/journals_controller_test.rb +2 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             require File.expand_path('../../test_helper', __FILE__)
             require 'journals_controller'
             # Re-raise errors caught by the controller.
             class JournalsController; def rescue_action(e) raise e end; end
             class JournalsControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules
+              fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules,
+                :trackers, :issue_statuses, :enumerations, :custom_fields, :custom_values, :custom_fields_projects
               def setup
                 @controller = JournalsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_not_nil assigns(:journals)
                 assert_equal 'application/atom+xml', @response.content_type
               end
               def test_diff
                 get :diff, :id => 3, :detail_id => 4
                 assert_response :success
                 assert_template 'diff'
                 assert_tag 'span',
                   :attributes => {:class => 'diff_out'},
                   :content => /removed/
                 assert_tag 'span',
                   :attributes => {:class => 'diff_in'},
                   :content => /added/
               end
               def test_reply_to_issue
                 @request.session[:user_id] = 2
                 get :new, :id => 6
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_reply_to_issue_without_permission
                 @request.session[:user_id] = 7
                 get :new, :id => 6
                 assert_response 403
               end
               def test_reply_to_note
                 @request.session[:user_id] = 2
                 get :new, :id => 6, :journal_id => 4
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_get_edit
                 @request.session[:user_id] = 1
                 xhr :get, :edit, :id => 2
                 assert_response :success
                 assert_select_rjs :insert, :after, 'journal-2-notes' do
                   assert_select 'form[id=journal-2-form]'
                   assert_select 'textarea'
                 end
               end
               def test_post_edit
                 @request.session[:user_id] = 1
                 xhr :post, :edit, :id => 2, :notes => 'Updated notes'
                 assert_response :success
                 assert_select_rjs :replace, 'journal-2-notes'
                 assert_equal 'Updated notes', Journal.find(2).notes
               end
               def test_post_edit_with_empty_notes
                 @request.session[:user_id] = 1
                 xhr :post, :edit, :id => 2, :notes => ''
                 assert_response :success
                 assert_select_rjs :remove, 'change-2'
                 assert_nil Journal.find_by_id(2)
               end
             end

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