##// END OF EJS Templates
scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465)...
scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465) Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be , following error raises. <pre> Traceback (most recent call last): File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module> mercurial.dispatch.run() File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run sys.exit(dispatch(sys.argv[1:])) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch return _runcatch(u, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch return _dispatch(ui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch cmd, func, args, options, cmdoptions = _parse(lui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse args = fancyopts.fancyopts(args, c, cmdoptions, True) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts for short, name, default, comment in options: ValueError: too many values to unpack 1) Error: test_nodes_in_branch(MercurialAdapterTest): Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1 lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg' lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch' </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7640 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r6678:a5d0a7e67973
r7520:a6d3409a5a0c
Show More
calendars_controller.rb
56 lines | 2.1 KiB | text/x-ruby | RubyLexer
/ app / controllers / calendars_controller.rb
# 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 CalendarsController < ApplicationController
menu_item :calendar
before_filter :find_optional_project
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
helper :issues
helper :projects
helper :queries
include QueriesHelper
helper :sort
include SortHelper
def show
if params[:year] and params[:year].to_i > 1900
@year = params[:year].to_i
if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
@month = params[:month].to_i
end
end
@year ||= Date.today.year
@month ||= Date.today.month
@calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
retrieve_query
@query.group_by = nil
if @query.valid?
events = []
events += @query.issues(:include => [:tracker, :assigned_to, :priority],
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
)
events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
@calendar.events = events
end
render :action => 'show', :layout => false if request.xhr?
end
end