Merge remote-tracking branch 'origin/stable-1.3' into stable-1.3

Antonio Terceiro
2 parents d76b1434 f170cd12
Showing 3 changed files with 7 additions and 5 deletions Show diff stats
app/helpers/forms_helper.rb
app/models/article.rb
test/functional/content_viewer_controller_test.rb
@@ -186,6 +186,7 @@ module FormsHelper
     element_id = html_options[:id] || 'datepicker-date'
     value = value.strftime(format) if value.present?
     method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
+    current_date_or_nil = value.present? ? "new Date('#{value}')" : "null"
     result = text_field_tag(name, value, html_options)
     result +=
     "
@@ -236,7 +237,7 @@ module FormsHelper
         weekHeader: #{datepicker_options[:week_header].to_json},
         yearRange: #{datepicker_options[:year_range].to_json},
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
-      }).datepicker('setDate', new Date('#{value}'))
+      }).datepicker('setDate', current_date_or_nil)
     </script>
     ".html_safe
     result
@@ -77,7 +77,7 @@ class Article &lt; ActiveRecord::Base
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
-  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
+  has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
   has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
   has_many :categories, :through => :article_categorizations
@@ -1163,9 +1163,10 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'add an zero width space every 4 caracters of comment urls' do
     url = 'www.an.url.to.be.splited.com'
-    a = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
-    c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
-    get :view_page, :profile => @profile.identifier, :page => [ 'textile' ]
+    a = @profile.articles.build(:name => 'test')
+    a.save!
+    c = a.comments.create!(:author => @profile, :title => 'An url', :body => url, :source => a)
+    get :view_page, :profile => @profile.identifier, :page => [ 'test' ]
     assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('&#x200B;')
   end
	@@ -77,7 +77,7 @@ class Article < ActiveRecord::Base		@@ -77,7 +77,7 @@ class Article < ActiveRecord::Base
77	belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'	77	belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
78	belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'	78	belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
79		79
80	- has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'	80	+ has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
81		81
82	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]	82	has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
83	has_many :categories, :through => :article_categorizations	83	has_many :categories, :through => :article_categorizations