# HG changeset patch # User Chris Cannam # Date 1280315308 -3600 # Node ID cca12e1c1fd42644845f36bfbeb6fd03305be729 # Parent 513646585e45d1f26ea5e8d75bf93daca99e2f83 * Update to Redmine trunk (SVN revisions 3860-3892) diff -r 513646585e45 -r cca12e1c1fd4 .svn/all-wcprops --- a/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 24 -/svn/!svn/ver/3859/trunk +/svn/!svn/ver/3891/trunk END Rakefile K 25 diff -r 513646585e45 -r cca12e1c1fd4 .svn/entries --- a/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk http://redmine.rubyforge.org/svn -2010-07-20T23:50:15.173990Z -3859 -edavis10 +2010-07-25T12:56:57.556116Z +3891 +jplang has-props @@ -69,6 +69,9 @@ 307 +extra +dir + README.rdoc file @@ -103,9 +106,6 @@ 208 -extra -dir - db dir @@ -121,12 +121,6 @@ script dir -doc -dir - -config -dir - .gitignore file @@ -161,6 +155,12 @@ 322 +config +dir + +doc +dir + lib dir diff -r 513646585e45 -r cca12e1c1fd4 app/.svn/all-wcprops --- a/app/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,5 +1,5 @@ K 25 svn:wc:ra_dav:version-url V 28 -/svn/!svn/ver/3859/trunk/app +/svn/!svn/ver/3889/trunk/app END diff -r 513646585e45 -r cca12e1c1fd4 app/.svn/entries --- a/app/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app http://redmine.rubyforge.org/svn -2010-07-20T23:50:15.173990Z -3859 -edavis10 +2010-07-25T12:48:28.979207Z +3889 +jplang diff -r 513646585e45 -r cca12e1c1fd4 app/controllers/.svn/all-wcprops --- a/app/controllers/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/controllers/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 40 -/svn/!svn/ver/3827/trunk/app/controllers +/svn/!svn/ver/3885/trunk/app/controllers END issues_controller.rb K 25 @@ -99,18 +99,18 @@ V 66 /svn/!svn/ver/3827/trunk/app/controllers/application_controller.rb END +auth_sources_controller.rb +K 25 +svn:wc:ra_dav:version-url +V 67 +/svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb +END ldap_auth_sources_controller.rb K 25 svn:wc:ra_dav:version-url V 72 /svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb END -auth_sources_controller.rb -K 25 -svn:wc:ra_dav:version-url -V 67 -/svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb -END search_controller.rb K 25 svn:wc:ra_dav:version-url @@ -123,18 +123,18 @@ V 63 /svn/!svn/ver/3528/trunk/app/controllers/messages_controller.rb END +versions_controller.rb +K 25 +svn:wc:ra_dav:version-url +V 63 +/svn/!svn/ver/3866/trunk/app/controllers/versions_controller.rb +END issue_relations_controller.rb K 25 svn:wc:ra_dav:version-url V 70 /svn/!svn/ver/3591/trunk/app/controllers/issue_relations_controller.rb END -versions_controller.rb -K 25 -svn:wc:ra_dav:version-url -V 63 -/svn/!svn/ver/3668/trunk/app/controllers/versions_controller.rb -END boards_controller.rb K 25 svn:wc:ra_dav:version-url @@ -223,7 +223,7 @@ K 25 svn:wc:ra_dav:version-url V 61 -/svn/!svn/ver/3716/trunk/app/controllers/gantts_controller.rb +/svn/!svn/ver/3885/trunk/app/controllers/gantts_controller.rb END documents_controller.rb K 25 diff -r 513646585e45 -r cca12e1c1fd4 app/controllers/.svn/entries --- a/app/controllers/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/controllers/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/controllers http://redmine.rubyforge.org/svn -2010-07-05T18:00:50.379659Z -3827 -edavis10 +2010-07-25T11:43:19.719822Z +3885 +jplang @@ -570,40 +570,6 @@ 11860 -ldap_auth_sources_controller.rb -file - - - - -2010-07-23T14:49:44.748131Z -5f7b9cb2e9c8a60db58ea0833cf481c5 -2010-05-23T03:16:31.304135Z -3744 -edavis10 - - - - - - - - - - - - - - - - - - - - - -917 - auth_sources_controller.rb file @@ -638,6 +604,40 @@ 2542 +ldap_auth_sources_controller.rb +file + + + + +2010-07-23T14:49:44.748131Z +5f7b9cb2e9c8a60db58ea0833cf481c5 +2010-05-23T03:16:31.304135Z +3744 +edavis10 + + + + + + + + + + + + + + + + + + + + + +917 + search_controller.rb file @@ -706,6 +706,40 @@ 5824 +versions_controller.rb +file + + + + +2010-07-28T11:07:47.104150Z +a243808f2423e88dda09f5adb6c99ba6 +2010-07-25T09:29:46.849682Z +3866 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +3951 + issue_relations_controller.rb file @@ -740,40 +774,6 @@ 2220 -versions_controller.rb -file - - - - -2010-07-23T14:49:44.748131Z -577abe84b133bc0c23f48bf572fc2cea -2010-04-11T17:47:29.719005Z -3668 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -3772 - boards_controller.rb file @@ -1256,33 +1256,33 @@ -2010-07-23T14:49:44.756136Z -18dc9eabaf0bb9c1085b3f123be7ef74 -2010-04-30T17:24:11.419110Z -3716 -edavis10 - - - - - - - - - - - - - - - - - - - - - -2310 +2010-07-28T11:07:47.104150Z +43f8fc731af8112723123c97ea49987e +2010-07-25T11:43:19.719822Z +3885 +jplang + + + + + + + + + + + + + + + + + + + + + +2320 documents_controller.rb file diff -r 513646585e45 -r cca12e1c1fd4 app/controllers/.svn/text-base/gantts_controller.rb.svn-base --- a/app/controllers/.svn/text-base/gantts_controller.rb.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/controllers/.svn/text-base/gantts_controller.rb.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -37,7 +37,7 @@ respond_to do |format| format.html { render :action => "show", :layout => !request.xhr? } - format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') + format.png { send_data(@gantt.to_image(@project), :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") } end end diff -r 513646585e45 -r cca12e1c1fd4 app/controllers/.svn/text-base/versions_controller.rb.svn-base --- a/app/controllers/.svn/text-base/versions_controller.rb.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/controllers/.svn/text-base/versions_controller.rb.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -27,6 +27,9 @@ helper :projects def show + @issues = @version.fixed_issues.visible.find(:all, + :include => [:status, :tracker, :priority], + :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") end def new diff -r 513646585e45 -r cca12e1c1fd4 app/controllers/gantts_controller.rb --- a/app/controllers/gantts_controller.rb Fri Jul 23 15:52:44 2010 +0100 +++ b/app/controllers/gantts_controller.rb Wed Jul 28 12:08:28 2010 +0100 @@ -37,7 +37,7 @@ respond_to do |format| format.html { render :action => "show", :layout => !request.xhr? } - format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') + format.png { send_data(@gantt.to_image(@project), :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") } end end diff -r 513646585e45 -r cca12e1c1fd4 app/controllers/versions_controller.rb --- a/app/controllers/versions_controller.rb Fri Jul 23 15:52:44 2010 +0100 +++ b/app/controllers/versions_controller.rb Wed Jul 28 12:08:28 2010 +0100 @@ -27,6 +27,9 @@ helper :projects def show + @issues = @version.fixed_issues.visible.find(:all, + :include => [:status, :tracker, :priority], + :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") end def new diff -r 513646585e45 -r cca12e1c1fd4 app/helpers/.svn/entries --- a/app/helpers/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/helpers/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/helpers http://redmine.rubyforge.org/svn @@ -706,6 +706,40 @@ 817 +workflows_helper.rb +file + + + + +2010-07-23T14:49:44.284157Z +4f7bcbe149363ecb18080e3ce6c3f761 +2008-09-28T12:03:17.584169Z +1914 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +824 + journals_helper.rb file @@ -740,40 +774,6 @@ 2266 -workflows_helper.rb -file - - - - -2010-07-23T14:49:44.284157Z -4f7bcbe149363ecb18080e3ce6c3f761 -2008-09-28T12:03:17.584169Z -1914 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -824 - reports_helper.rb file @@ -808,6 +808,74 @@ 1265 +custom_fields_helper.rb +file + + + + +2010-07-23T14:49:44.284157Z +97753365c8eb76a948d7417d5db31079 +2010-04-16T15:34:05.970144Z +3675 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +5322 + +settings_helper.rb +file + + + + +2010-07-23T14:49:44.284157Z +72a1f70b395a94a9efae4d1046d5df2b +2009-12-23T17:56:39.685148Z +3222 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +3350 + timelog_helper.rb file @@ -842,74 +910,6 @@ 6636 -settings_helper.rb -file - - - - -2010-07-23T14:49:44.284157Z -72a1f70b395a94a9efae4d1046d5df2b -2009-12-23T17:56:39.685148Z -3222 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -3350 - -custom_fields_helper.rb -file - - - - -2010-07-23T14:49:44.284157Z -97753365c8eb76a948d7417d5db31079 -2010-04-16T15:34:05.970144Z -3675 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -5322 - users_helper.rb file diff -r 513646585e45 -r cca12e1c1fd4 app/models/.svn/all-wcprops --- a/app/models/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 35 -/svn/!svn/ver/3830/trunk/app/models +/svn/!svn/ver/3881/trunk/app/models END document.rb K 25 @@ -73,7 +73,7 @@ K 25 svn:wc:ra_dav:version-url V 45 -/svn/!svn/ver/3830/trunk/app/models/change.rb +/svn/!svn/ver/3860/trunk/app/models/change.rb END enumeration.rb K 25 @@ -81,6 +81,12 @@ V 50 /svn/!svn/ver/3240/trunk/app/models/enumeration.rb END +issue.rb +K 25 +svn:wc:ra_dav:version-url +V 44 +/svn/!svn/ver/3821/trunk/app/models/issue.rb +END time_entry_activity_custom_field.rb K 25 svn:wc:ra_dav:version-url @@ -93,12 +99,6 @@ V 50 /svn/!svn/ver/3250/trunk/app/models/member_role.rb END -issue.rb -K 25 -svn:wc:ra_dav:version-url -V 44 -/svn/!svn/ver/3821/trunk/app/models/issue.rb -END issue_priority.rb K 25 svn:wc:ra_dav:version-url @@ -111,17 +111,23 @@ V 55 /svn/!svn/ver/3169/trunk/app/models/message_observer.rb END +wiki_content.rb +K 25 +svn:wc:ra_dav:version-url +V 51 +/svn/!svn/ver/3632/trunk/app/models/wiki_content.rb +END watcher.rb K 25 svn:wc:ra_dav:version-url V 46 /svn/!svn/ver/3167/trunk/app/models/watcher.rb END -wiki_content.rb +wiki_page.rb K 25 svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/3632/trunk/app/models/wiki_content.rb +V 48 +/svn/!svn/ver/3632/trunk/app/models/wiki_page.rb END enabled_module.rb K 25 @@ -129,12 +135,6 @@ V 53 /svn/!svn/ver/2970/trunk/app/models/enabled_module.rb END -wiki_page.rb -K 25 -svn:wc:ra_dav:version-url -V 48 -/svn/!svn/ver/3632/trunk/app/models/wiki_page.rb -END comment.rb K 25 svn:wc:ra_dav:version-url @@ -171,18 +171,18 @@ V 45 /svn/!svn/ver/3608/trunk/app/models/mailer.rb END +workflow.rb +K 25 +svn:wc:ra_dav:version-url +V 47 +/svn/!svn/ver/3709/trunk/app/models/workflow.rb +END journal.rb K 25 svn:wc:ra_dav:version-url V 46 /svn/!svn/ver/2615/trunk/app/models/journal.rb END -workflow.rb -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/3709/trunk/app/models/workflow.rb -END user_custom_field.rb K 25 svn:wc:ra_dav:version-url @@ -211,7 +211,7 @@ K 25 svn:wc:ra_dav:version-url V 43 -/svn/!svn/ver/3813/trunk/app/models/user.rb +/svn/!svn/ver/3873/trunk/app/models/user.rb END auth_source.rb K 25 @@ -283,7 +283,7 @@ K 25 svn:wc:ra_dav:version-url V 51 -/svn/!svn/ver/3157/trunk/app/models/issue_status.rb +/svn/!svn/ver/3881/trunk/app/models/issue_status.rb END time_entry_activity.rb K 25 diff -r 513646585e45 -r cca12e1c1fd4 app/models/.svn/entries --- a/app/models/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/models http://redmine.rubyforge.org/svn -2010-07-06T21:06:09.916658Z -3830 -edavis10 +2010-07-25T10:48:27.199057Z +3881 +jplang @@ -409,10 +409,10 @@ -2010-07-23T14:49:44.584123Z -9674071411c7c7c45a85b801dd9827d0 -2010-07-06T21:06:09.916658Z -3830 +2010-07-28T11:07:47.068192Z +622826f16c01373c631876eb1e480a65 +2010-07-24T00:19:32.307471Z +3860 edavis10 has-props @@ -435,7 +435,7 @@ -1033 +1061 enumeration.rb file @@ -471,6 +471,74 @@ 3856 +time_entry_activity_custom_field.rb +file + + + + +2010-07-23T14:49:44.584123Z +d5549b2847a255d4bdd7185a670988b5 +2009-10-21T22:35:03.091600Z +2952 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +896 + +member_role.rb +file + + + + +2010-07-23T14:49:44.584123Z +95caba31fc55fea2d5ff257e70cf14b2 +2009-12-26T16:14:55.591181Z +3250 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +2011 + issue.rb file @@ -505,74 +573,6 @@ 30712 -member_role.rb -file - - - - -2010-07-23T14:49:44.584123Z -95caba31fc55fea2d5ff257e70cf14b2 -2009-12-26T16:14:55.591181Z -3250 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -2011 - -time_entry_activity_custom_field.rb -file - - - - -2010-07-23T14:49:44.584123Z -d5549b2847a255d4bdd7185a670988b5 -2009-10-21T22:35:03.091600Z -2952 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -896 - issue_priority.rb file @@ -641,6 +641,40 @@ 979 +wiki_content.rb +file + + + + +2010-07-23T14:49:44.584123Z +2ce4521051866ff5f654f8a8bddfc824 +2010-04-11T12:56:18.077630Z +3632 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +4458 + watcher.rb file @@ -675,14 +709,14 @@ 2093 -wiki_content.rb +wiki_page.rb file -2010-07-23T14:49:44.584123Z -2ce4521051866ff5f654f8a8bddfc824 +2010-07-23T14:49:44.588155Z +e6b3c8e83cb441a021358acf5d246d21 2010-04-11T12:56:18.077630Z 3632 jplang @@ -707,7 +741,7 @@ -4458 +6697 enabled_module.rb file @@ -743,40 +777,6 @@ 1296 -wiki_page.rb -file - - - - -2010-07-23T14:49:44.588155Z -e6b3c8e83cb441a021358acf5d246d21 -2010-04-11T12:56:18.077630Z -3632 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -6697 - comment.rb file @@ -981,6 +981,40 @@ 18252 +workflow.rb +file + + + + +2010-07-23T14:49:44.588155Z +4561dfcb12b3fa066a9516c59a9eef94 +2010-04-30T12:19:51.238583Z +3709 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +4028 + journal.rb file @@ -1015,40 +1049,6 @@ 3041 -workflow.rb -file - - - - -2010-07-23T14:49:44.588155Z -4561dfcb12b3fa066a9516c59a9eef94 -2010-04-30T12:19:51.238583Z -3709 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -4028 - user_custom_field.rb file @@ -1191,11 +1191,11 @@ -2010-07-23T14:49:44.592153Z -0714cc222648e2332f9aeca2080e932e -2010-06-24T03:08:20.720310Z -3813 -edavis10 +2010-07-28T11:07:47.068192Z +958beaebacc6b4d088803c989a1cf129 +2010-07-25T09:50:41.235614Z +3873 +jplang has-props @@ -1217,7 +1217,7 @@ -12583 +12652 auth_source.rb file @@ -1599,10 +1599,10 @@ -2010-07-23T14:49:44.592153Z -3d2be08d684f88b0cbd02fc693343e7d -2009-12-12T10:33:12.138303Z -3157 +2010-07-28T11:07:47.068192Z +44dc499c4e4dfc3601165f07e6daa4b5 +2010-07-25T10:48:27.199057Z +3881 jplang has-props @@ -1625,7 +1625,7 @@ -3286 +3447 time_entry_activity.rb file diff -r 513646585e45 -r cca12e1c1fd4 app/models/.svn/text-base/change.rb.svn-base --- a/app/models/.svn/text-base/change.rb.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/.svn/text-base/change.rb.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -19,12 +19,13 @@ belongs_to :changeset validates_presence_of :changeset_id, :action, :path + before_save :init_path def relative_path changeset.repository.relative_path(path) end - def before_save - path ||= "" + def init_path + self.path ||= "" end end diff -r 513646585e45 -r cca12e1c1fd4 app/models/.svn/text-base/issue_status.rb.svn-base --- a/app/models/.svn/text-base/issue_status.rb.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/.svn/text-base/issue_status.rb.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -17,8 +17,10 @@ class IssueStatus < ActiveRecord::Base before_destroy :check_integrity - has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all + has_many :workflows, :foreign_key => "old_status_id" acts_as_list + + before_destroy :delete_workflows validates_presence_of :name validates_uniqueness_of :name @@ -89,4 +91,9 @@ def check_integrity raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id]) end + + # Deletes associated workflows + def delete_workflows + Workflow.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}]) + end end diff -r 513646585e45 -r cca12e1c1fd4 app/models/.svn/text-base/user.rb.svn-base --- a/app/models/.svn/text-base/user.rb.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/.svn/text-base/user.rb.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -79,6 +79,10 @@ super end + def mail=(arg) + write_attribute(:mail, arg.to_s.strip) + end + def identity_url=(url) if url.blank? write_attribute(:identity_url, '') diff -r 513646585e45 -r cca12e1c1fd4 app/models/change.rb --- a/app/models/change.rb Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/change.rb Wed Jul 28 12:08:28 2010 +0100 @@ -19,12 +19,13 @@ belongs_to :changeset validates_presence_of :changeset_id, :action, :path + before_save :init_path def relative_path changeset.repository.relative_path(path) end - def before_save - path ||= "" + def init_path + self.path ||= "" end end diff -r 513646585e45 -r cca12e1c1fd4 app/models/issue_status.rb --- a/app/models/issue_status.rb Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/issue_status.rb Wed Jul 28 12:08:28 2010 +0100 @@ -17,8 +17,10 @@ class IssueStatus < ActiveRecord::Base before_destroy :check_integrity - has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all + has_many :workflows, :foreign_key => "old_status_id" acts_as_list + + before_destroy :delete_workflows validates_presence_of :name validates_uniqueness_of :name @@ -89,4 +91,9 @@ def check_integrity raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id]) end + + # Deletes associated workflows + def delete_workflows + Workflow.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}]) + end end diff -r 513646585e45 -r cca12e1c1fd4 app/models/repository/.svn/entries --- a/app/models/repository/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/repository/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/models/repository http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/models/user.rb --- a/app/models/user.rb Fri Jul 23 15:52:44 2010 +0100 +++ b/app/models/user.rb Wed Jul 28 12:08:28 2010 +0100 @@ -79,6 +79,10 @@ super end + def mail=(arg) + write_attribute(:mail, arg.to_s.strip) + end + def identity_url=(url) if url.blank? write_attribute(:identity_url, '') diff -r 513646585e45 -r cca12e1c1fd4 app/sweepers/.svn/entries --- a/app/sweepers/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/sweepers/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/sweepers http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/.svn/all-wcprops --- a/app/views/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,5 +1,5 @@ K 25 svn:wc:ra_dav:version-url V 34 -/svn/!svn/ver/3859/trunk/app/views +/svn/!svn/ver/3889/trunk/app/views END diff -r 513646585e45 -r cca12e1c1fd4 app/views/.svn/entries --- a/app/views/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views http://redmine.rubyforge.org/svn -2010-07-20T23:50:15.173990Z -3859 -edavis10 +2010-07-25T12:48:28.979207Z +3889 +jplang @@ -74,10 +74,10 @@ messages dir -issue_relations +versions dir -versions +issue_relations dir mailer @@ -110,10 +110,10 @@ repositories dir -admin +common dir -common +admin dir projects diff -r 513646585e45 -r cca12e1c1fd4 app/views/account/.svn/entries --- a/app/views/account/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/account/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/account http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/admin/.svn/all-wcprops --- a/app/views/admin/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/admin/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 40 -/svn/!svn/ver/3859/trunk/app/views/admin +/svn/!svn/ver/3889/trunk/app/views/admin END info.rhtml K 25 @@ -19,7 +19,7 @@ K 25 svn:wc:ra_dav:version-url V 52 -/svn/!svn/ver/3859/trunk/app/views/admin/_menu.rhtml +/svn/!svn/ver/3889/trunk/app/views/admin/_menu.rhtml END _no_data.rhtml K 25 diff -r 513646585e45 -r cca12e1c1fd4 app/views/admin/.svn/entries --- a/app/views/admin/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/admin/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/admin http://redmine.rubyforge.org/svn -2010-07-20T23:50:15.173990Z -3859 -edavis10 +2010-07-25T12:48:28.979207Z +3889 +jplang @@ -100,11 +100,11 @@ -2010-07-23T14:49:45.296098Z -f90bd8a5c5bb0cc8639c26a3ae18a716 -2010-07-20T23:50:15.173990Z -3859 -edavis10 +2010-07-28T11:07:47.204236Z +bb383f44008be2d2468619c1f64a1de8 +2010-07-25T12:48:28.979207Z +3889 +jplang has-props @@ -126,7 +126,7 @@ -1632 +1626 _no_data.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/admin/.svn/text-base/_menu.rhtml.svn-base --- a/app/views/admin/.svn/text-base/_menu.rhtml.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/admin/.svn/text-base/_menu.rhtml.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -3,7 +3,6 @@
  • <%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %>
  • <%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %>
  • <%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %>
  • -
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %>
  • <%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %>
  • <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %>
  • @@ -11,6 +10,7 @@
  • <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %>
  • <%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %>
  • <%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %>
  • +
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <% menu_items_for(:admin_menu) do |item| -%>
  • <%= link_to h(item.caption), item.url, item.html_options %>
  • <% end -%> diff -r 513646585e45 -r cca12e1c1fd4 app/views/admin/_menu.rhtml --- a/app/views/admin/_menu.rhtml Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/admin/_menu.rhtml Wed Jul 28 12:08:28 2010 +0100 @@ -3,7 +3,6 @@
  • <%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %>
  • <%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %>
  • <%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %>
  • -
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %>
  • <%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %>
  • <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %>
  • @@ -11,6 +10,7 @@
  • <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %>
  • <%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %>
  • <%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %>
  • +
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <% menu_items_for(:admin_menu) do |item| -%>
  • <%= link_to h(item.caption), item.url, item.html_options %>
  • <% end -%> diff -r 513646585e45 -r cca12e1c1fd4 app/views/attachments/.svn/all-wcprops --- a/app/views/attachments/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/attachments/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 46 -/svn/!svn/ver/3750/trunk/app/views/attachments +/svn/!svn/ver/3879/trunk/app/views/attachments END _links.rhtml K 25 @@ -19,7 +19,7 @@ K 25 svn:wc:ra_dav:version-url V 58 -/svn/!svn/ver/3750/trunk/app/views/attachments/_form.rhtml +/svn/!svn/ver/3879/trunk/app/views/attachments/_form.rhtml END diff.rhtml K 25 diff -r 513646585e45 -r cca12e1c1fd4 app/views/attachments/.svn/entries --- a/app/views/attachments/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/attachments/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/attachments http://redmine.rubyforge.org/svn -2010-05-25T00:11:58.476699Z -3750 -edavis10 +2010-07-25T10:34:55.569539Z +3879 +jplang @@ -100,11 +100,11 @@ -2010-07-23T14:49:45.176152Z -7dc9a00ffdd4aa997b9950a1913c62a2 -2010-05-25T00:11:58.476699Z -3750 -edavis10 +2010-07-28T11:07:47.180203Z +9cd3f9685ce632814961d9f7e67c4d26 +2010-07-25T10:34:55.569539Z +3879 +jplang has-props @@ -126,7 +126,7 @@ -531 +530 diff.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/attachments/.svn/text-base/_form.rhtml.svn-base --- a/app/views/attachments/.svn/text-base/_form.rhtml.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/attachments/.svn/text-base/_form.rhtml.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -1,6 +1,5 @@ -<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil -%> -
    diff -r 513646585e45 -r cca12e1c1fd4 app/views/attachments/_form.rhtml --- a/app/views/attachments/_form.rhtml Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/attachments/_form.rhtml Wed Jul 28 12:08:28 2010 +0100 @@ -1,6 +1,5 @@ -<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil -%> -
    diff -r 513646585e45 -r cca12e1c1fd4 app/views/auth_sources/.svn/entries --- a/app/views/auth_sources/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/auth_sources/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/auth_sources http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/boards/.svn/entries --- a/app/views/boards/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/boards/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/boards http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/calendars/.svn/entries --- a/app/views/calendars/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/calendars/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/calendars http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/common/.svn/entries --- a/app/views/common/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/common/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/common http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/custom_fields/.svn/entries --- a/app/views/custom_fields/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/custom_fields/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/custom_fields http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/documents/.svn/entries --- a/app/views/documents/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/documents/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/documents http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/enumerations/.svn/entries --- a/app/views/enumerations/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/enumerations/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/enumerations http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/gantts/.svn/entries --- a/app/views/gantts/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/gantts/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/gantts http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/groups/.svn/entries --- a/app/views/groups/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/groups/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/groups http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/issue_categories/.svn/entries --- a/app/views/issue_categories/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issue_categories/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/issue_categories http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/issue_relations/.svn/entries --- a/app/views/issue_relations/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issue_relations/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/issue_relations http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/issue_statuses/.svn/entries --- a/app/views/issue_statuses/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issue_statuses/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/issue_statuses http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/issues/.svn/all-wcprops --- a/app/views/issues/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issues/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 41 -/svn/!svn/ver/3842/trunk/app/views/issues +/svn/!svn/ver/3887/trunk/app/views/issues END _relations.rhtml K 25 @@ -9,17 +9,23 @@ V 58 /svn/!svn/ver/3577/trunk/app/views/issues/_relations.rhtml END +_action_menu.rhtml +K 25 +svn:wc:ra_dav:version-url +V 60 +/svn/!svn/ver/3127/trunk/app/views/issues/_action_menu.rhtml +END _history.rhtml K 25 svn:wc:ra_dav:version-url V 56 /svn/!svn/ver/3666/trunk/app/views/issues/_history.rhtml END -_action_menu.rhtml +_form.rhtml K 25 svn:wc:ra_dav:version-url -V 60 -/svn/!svn/ver/3127/trunk/app/views/issues/_action_menu.rhtml +V 53 +/svn/!svn/ver/3750/trunk/app/views/issues/_form.rhtml END bulk_edit.rhtml K 25 @@ -27,11 +33,11 @@ V 57 /svn/!svn/ver/3479/trunk/app/views/issues/bulk_edit.rhtml END -_form.rhtml +_form_update.rhtml K 25 svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/3750/trunk/app/views/issues/_form.rhtml +V 60 +/svn/!svn/ver/3151/trunk/app/views/issues/_form_update.rhtml END changes.rxml K 25 @@ -39,11 +45,17 @@ V 54 /svn/!svn/ver/2768/trunk/app/views/issues/changes.rxml END -_form_update.rhtml +preview.html.erb K 25 svn:wc:ra_dav:version-url -V 60 -/svn/!svn/ver/3151/trunk/app/views/issues/_form_update.rhtml +V 58 +/svn/!svn/ver/3623/trunk/app/views/issues/preview.html.erb +END +move.rhtml +K 25 +svn:wc:ra_dav:version-url +V 52 +/svn/!svn/ver/3476/trunk/app/views/issues/move.rhtml END index.xml.builder K 25 @@ -51,36 +63,24 @@ V 59 /svn/!svn/ver/3671/trunk/app/views/issues/index.xml.builder END -move.rhtml -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/3476/trunk/app/views/issues/move.rhtml -END -preview.html.erb -K 25 -svn:wc:ra_dav:version-url -V 58 -/svn/!svn/ver/3623/trunk/app/views/issues/preview.html.erb -END index.rhtml K 25 svn:wc:ra_dav:version-url V 53 /svn/!svn/ver/3842/trunk/app/views/issues/index.rhtml END -context_menu.rhtml -K 25 -svn:wc:ra_dav:version-url -V 60 -/svn/!svn/ver/3521/trunk/app/views/issues/context_menu.rhtml -END _sidebar.rhtml K 25 svn:wc:ra_dav:version-url V 56 /svn/!svn/ver/3695/trunk/app/views/issues/_sidebar.rhtml END +context_menu.rhtml +K 25 +svn:wc:ra_dav:version-url +V 60 +/svn/!svn/ver/3887/trunk/app/views/issues/context_menu.rhtml +END _list.rhtml K 25 svn:wc:ra_dav:version-url diff -r 513646585e45 -r cca12e1c1fd4 app/views/issues/.svn/entries --- a/app/views/issues/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issues/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,15 +1,15 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/issues http://redmine.rubyforge.org/svn -2010-07-16T03:16:29.364437Z -3842 -edavis10 +2010-07-25T11:55:57.048318Z +3887 +jplang @@ -60,6 +60,40 @@ 1704 +_action_menu.rhtml +file + + + + +2010-07-23T14:49:45.572128Z +b954330bb27ceae7739f4a2027ef4d2c +2009-12-06T12:52:03.167308Z +3127 +jplang + + + + + + + + + + + + + + + + + + + + + +1225 + _history.rhtml file @@ -94,17 +128,18 @@ 840 -_action_menu.rhtml +_form.rhtml file 2010-07-23T14:49:45.572128Z -b954330bb27ceae7739f4a2027ef4d2c -2009-12-06T12:52:03.167308Z -3127 -jplang +2ae2c4f2237b78939f84a3a6105a2c3f +2010-05-25T00:11:58.476699Z +3750 +edavis10 +has-props @@ -125,8 +160,7 @@ - -1225 +2150 bulk_edit.rhtml file @@ -162,16 +196,16 @@ 3320 -_form.rhtml +_form_update.rhtml file 2010-07-23T14:49:45.572128Z -2ae2c4f2237b78939f84a3a6105a2c3f -2010-05-25T00:11:58.476699Z -3750 +00a1336147a304d10f556a97f7105a83 +2009-12-11T18:48:34.197724Z +3151 edavis10 has-props @@ -194,7 +228,7 @@ -2150 +649 changes.rxml file @@ -230,17 +264,17 @@ 1485 -_form_update.rhtml +preview.html.erb file 2010-07-23T14:49:45.572128Z -00a1336147a304d10f556a97f7105a83 -2009-12-11T18:48:34.197724Z -3151 -edavis10 +359c6608ef716c8b3b62fd96c241a680 +2010-03-28T15:17:46.994797Z +3623 +jplang has-props @@ -262,7 +296,41 @@ -649 +389 + +move.rhtml +file + + + + +2010-07-23T14:49:45.572128Z +f46181787ba26b8798b01c82777a0a3e +2010-02-23T21:04:12.801819Z +3476 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +2286 index.xml.builder file @@ -298,74 +366,6 @@ 1559 -move.rhtml -file - - - - -2010-07-23T14:49:45.572128Z -f46181787ba26b8798b01c82777a0a3e -2010-02-23T21:04:12.801819Z -3476 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -2286 - -preview.html.erb -file - - - - -2010-07-23T14:49:45.572128Z -359c6608ef716c8b3b62fd96c241a680 -2010-03-28T15:17:46.994797Z -3623 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -389 - index.rhtml file @@ -400,40 +400,6 @@ 4032 -context_menu.rhtml -file - - - - -2010-07-23T14:49:45.572128Z -400af844f36cdf783fd35439766cbdce -2010-03-01T20:54:55.453785Z -3521 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -6535 - _sidebar.rhtml file @@ -468,6 +434,40 @@ 1136 +context_menu.rhtml +file + + + + +2010-07-28T11:07:47.260180Z +b1851405254cb168e5927196188996d2 +2010-07-25T11:55:57.048318Z +3887 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +6606 + _list.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/issues/.svn/text-base/context_menu.rhtml.svn-base --- a/app/views/issues/.svn/text-base/context_menu.rhtml.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issues/.svn/text-base/context_menu.rhtml.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -8,7 +8,7 @@ <%= l(:field_status) %> @@ -34,7 +34,7 @@ @@ -83,7 +83,7 @@ diff -r 513646585e45 -r cca12e1c1fd4 app/views/issues/context_menu.rhtml --- a/app/views/issues/context_menu.rhtml Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/issues/context_menu.rhtml Wed Jul 28 12:08:28 2010 +0100 @@ -8,7 +8,7 @@ <%= l(:field_status) %> @@ -34,7 +34,7 @@ @@ -83,7 +83,7 @@ diff -r 513646585e45 -r cca12e1c1fd4 app/views/journals/.svn/entries --- a/app/views/journals/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/journals/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/journals http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/layouts/.svn/entries --- a/app/views/layouts/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/layouts/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/layouts http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/ldap_auth_sources/.svn/entries --- a/app/views/ldap_auth_sources/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/ldap_auth_sources/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/ldap_auth_sources http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/mailer/.svn/entries --- a/app/views/mailer/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/mailer/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/mailer http://redmine.rubyforge.org/svn @@ -672,6 +672,40 @@ 629 +attachments_added.text.html.rhtml +file + + + + +2010-07-23T14:49:45.160129Z +db9ef17343824d59b7a19db7036ee2f1 +2010-02-18T19:13:38.135448Z +3452 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +144 + news_added.text.plain.rhtml file @@ -706,40 +740,6 @@ 87 -attachments_added.text.html.rhtml -file - - - - -2010-07-23T14:49:45.160129Z -db9ef17343824d59b7a19db7036ee2f1 -2010-02-18T19:13:38.135448Z -3452 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -144 - news_added.text.html.rhtml file @@ -808,6 +808,40 @@ 107 +issue_add.text.plain.rhtml +file + + + + +2010-07-23T14:49:45.164129Z +52a0f774acd5b7aeeb3768de943af901 +2009-02-21T11:04:50.579477Z +2493 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +224 + document_added.text.html.rhtml file @@ -842,40 +876,6 @@ 163 -issue_add.text.plain.rhtml -file - - - - -2010-07-23T14:49:45.164129Z -52a0f774acd5b7aeeb3768de943af901 -2009-02-21T11:04:50.579477Z -2493 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -224 - account_information.text.plain.rhtml file @@ -910,6 +910,40 @@ 295 +account_information.text.html.rhtml +file + + + + +2010-07-23T14:49:45.164129Z +e7e91d7f18dd1547cfebafdf4822a18f +2010-02-18T19:13:38.135448Z +3452 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +368 + message_posted.text.plain.rhtml file @@ -944,16 +978,16 @@ 68 -account_information.text.html.rhtml +lost_password.text.plain.rhtml file 2010-07-23T14:49:45.164129Z -e7e91d7f18dd1547cfebafdf4822a18f -2010-02-18T19:13:38.135448Z -3452 +44018a44ceaecb5c9be3fed66e759064 +2008-07-21T19:13:46.546624Z +1683 jplang has-props @@ -976,7 +1010,7 @@ -368 +97 wiki_content_updated.text.plain.rhtml file @@ -1012,40 +1046,6 @@ 290 -lost_password.text.plain.rhtml -file - - - - -2010-07-23T14:49:45.164129Z -44018a44ceaecb5c9be3fed66e759064 -2008-07-21T19:13:46.546624Z -1683 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -97 - lost_password.text.html.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/members/.svn/entries --- a/app/views/members/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/members/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/members http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/messages/.svn/all-wcprops --- a/app/views/messages/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/messages/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,13 +1,13 @@ K 25 svn:wc:ra_dav:version-url V 43 -/svn/!svn/ver/3377/trunk/app/views/messages +/svn/!svn/ver/3877/trunk/app/views/messages END show.rhtml K 25 svn:wc:ra_dav:version-url V 54 -/svn/!svn/ver/3377/trunk/app/views/messages/show.rhtml +/svn/!svn/ver/3877/trunk/app/views/messages/show.rhtml END _form.rhtml K 25 diff -r 513646585e45 -r cca12e1c1fd4 app/views/messages/.svn/entries --- a/app/views/messages/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/messages/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,14 +1,14 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/messages http://redmine.rubyforge.org/svn -2010-02-06T14:15:52.105525Z -3377 +2010-07-25T10:02:12.905073Z +3877 jplang @@ -32,10 +32,10 @@ -2010-07-23T14:49:45.128097Z -64f711ba6796fb638cf19952e36fc12f -2010-02-06T14:15:52.105525Z -3377 +2010-07-28T11:07:47.120163Z +c68f1ef8a922f2a408e0349d80db4376 +2010-07-25T10:02:12.905073Z +3877 jplang has-props @@ -58,7 +58,7 @@ -3561 +3576 _form.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/messages/.svn/text-base/show.rhtml.svn-base --- a/app/views/messages/.svn/text-base/show.rhtml.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/messages/.svn/text-base/show.rhtml.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -30,7 +30,7 @@

    <%= avatar(message.author, :size => "24") %> - <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %> + <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %> - <%= authoring message.created_on, message.author %>

    diff -r 513646585e45 -r cca12e1c1fd4 app/views/messages/show.rhtml --- a/app/views/messages/show.rhtml Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/messages/show.rhtml Wed Jul 28 12:08:28 2010 +0100 @@ -30,7 +30,7 @@

    <%= avatar(message.author, :size => "24") %> - <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %> + <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %> - <%= authoring message.created_on, message.author %>

    diff -r 513646585e45 -r cca12e1c1fd4 app/views/my/.svn/entries --- a/app/views/my/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/my/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/my http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/my/blocks/.svn/entries --- a/app/views/my/blocks/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/my/blocks/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/my/blocks http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/news/.svn/entries --- a/app/views/news/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/news/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/news http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/projects/.svn/entries --- a/app/views/projects/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/projects/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/projects http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/projects/settings/.svn/entries --- a/app/views/projects/settings/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/projects/settings/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/projects/settings http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/queries/.svn/entries --- a/app/views/queries/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/queries/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/queries http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/reports/.svn/entries --- a/app/views/reports/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/reports/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/reports http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/repositories/.svn/entries --- a/app/views/repositories/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/repositories/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/repositories http://redmine.rubyforge.org/svn @@ -26,6 +26,74 @@ e93f8b46-1217-0410-a6f0-8f06a7374b81 +_navigation.rhtml +file + + + + +2010-07-23T14:49:45.280131Z +59dbb643c447518053d9cdb1a86cb5ef +2009-11-24T17:55:45.336708Z +3086 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +910 + +revision.rhtml +file + + + + +2010-07-23T14:49:45.280131Z +bd525284ca2c21084be84d21823b552a +2009-12-22T23:23:54.920563Z +3216 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +1953 + stats.rhtml file @@ -60,74 +128,6 @@ 581 -revision.rhtml -file - - - - -2010-07-23T14:49:45.280131Z -bd525284ca2c21084be84d21823b552a -2009-12-22T23:23:54.920563Z -3216 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -1953 - -_navigation.rhtml -file - - - - -2010-07-23T14:49:45.280131Z -59dbb643c447518053d9cdb1a86cb5ef -2009-11-24T17:55:45.336708Z -3086 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -910 - entry.rhtml file @@ -196,6 +196,74 @@ 1724 +_dir_list.rhtml +file + + + + +2010-07-23T14:49:45.284128Z +8c004b6e433ac1a6ca64c97a35512f28 +2008-01-02T22:41:53.166620Z +1032 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +350 + +changes.rhtml +file + + + + +2010-07-23T14:49:45.284128Z +cde7a86a5ec0cf9915b0540c9acbb820 +2009-08-15T22:41:40.505056Z +2840 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +636 + diff.rhtml file @@ -230,74 +298,6 @@ 962 -changes.rhtml -file - - - - -2010-07-23T14:49:45.284128Z -cde7a86a5ec0cf9915b0540c9acbb820 -2009-08-15T22:41:40.505056Z -2840 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -636 - -_dir_list.rhtml -file - - - - -2010-07-23T14:49:45.284128Z -8c004b6e433ac1a6ca64c97a35512f28 -2008-01-02T22:41:53.166620Z -1032 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -350 - annotate.rhtml file @@ -332,6 +332,40 @@ 1420 +_revisions.rhtml +file + + + + +2010-07-23T14:49:45.280131Z +e7a6bdebdc02cae051102093180af71e +2009-12-22T23:23:54.920563Z +3216 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +1346 + show.rhtml file @@ -366,40 +400,6 @@ 1461 -_revisions.rhtml -file - - - - -2010-07-23T14:49:45.280131Z -e7a6bdebdc02cae051102093180af71e -2009-12-22T23:23:54.920563Z -3216 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -1346 - revisions.rhtml file @@ -434,6 +434,40 @@ 810 +_link_to_functions.rhtml +file + + + + +2010-07-23T14:49:45.280131Z +a86ac8a045315f57fa32acb29c08f19f +2009-09-01T12:13:17.386587Z +2849 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +847 + committers.rhtml file @@ -468,40 +502,6 @@ 857 -_link_to_functions.rhtml -file - - - - -2010-07-23T14:49:45.280131Z -a86ac8a045315f57fa32acb29c08f19f -2009-09-01T12:13:17.386587Z -2849 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -847 - _breadcrumbs.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/roles/.svn/entries --- a/app/views/roles/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/roles/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/roles http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/search/.svn/entries --- a/app/views/search/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/search/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/search http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/settings/.svn/entries --- a/app/views/settings/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/settings/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/settings http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/timelog/.svn/entries --- a/app/views/timelog/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/timelog/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/timelog http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/trackers/.svn/entries --- a/app/views/trackers/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/trackers/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/trackers http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/users/.svn/entries --- a/app/views/users/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/users/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/users http://redmine.rubyforge.org/svn diff -r 513646585e45 -r cca12e1c1fd4 app/views/versions/.svn/all-wcprops --- a/app/views/versions/.svn/all-wcprops Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/versions/.svn/all-wcprops Wed Jul 28 12:08:28 2010 +0100 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 43 -/svn/!svn/ver/3548/trunk/app/views/versions +/svn/!svn/ver/3865/trunk/app/views/versions END new.html.erb K 25 @@ -13,7 +13,7 @@ K 25 svn:wc:ra_dav:version-url V 54 -/svn/!svn/ver/3066/trunk/app/views/versions/show.rhtml +/svn/!svn/ver/3865/trunk/app/views/versions/show.rhtml END _form.rhtml K 25 diff -r 513646585e45 -r cca12e1c1fd4 app/views/versions/.svn/entries --- a/app/views/versions/.svn/entries Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/versions/.svn/entries Wed Jul 28 12:08:28 2010 +0100 @@ -1,14 +1,14 @@ 10 dir -3859 +3892 http://redmine.rubyforge.org/svn/trunk/app/views/versions http://redmine.rubyforge.org/svn -2010-03-06T18:25:01.409596Z -3548 +2010-07-25T09:29:17.138530Z +3865 jplang @@ -66,10 +66,10 @@ -2010-07-23T14:49:45.132098Z -9451a1d7cbf14da84d28f829585f6842 -2009-11-15T15:42:44.878519Z -3066 +2010-07-28T11:07:47.152444Z +8379ceed7dc6c8649080fbc6460897c5 +2010-07-25T09:29:17.138530Z +3865 jplang has-props @@ -92,7 +92,7 @@ -1900 +1664 _form.rhtml file diff -r 513646585e45 -r cca12e1c1fd4 app/views/versions/.svn/text-base/show.rhtml.svn-base --- a/app/views/versions/.svn/text-base/show.rhtml.svn-base Fri Jul 23 15:52:44 2010 +0100 +++ b/app/views/versions/.svn/text-base/show.rhtml.svn-base Wed Jul 28 12:08:28 2010 +0100 @@ -32,13 +32,10 @@ <%= render :partial => 'versions/overview', :locals => {:version => @version} %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -<% issues = @version.fixed_issues.find(:all, - :include => [:status, :tracker, :priority], - :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %> -<% if issues.size > 0 %> +<% if @issues.present? %>