[Git][noosfero/noosfero][stable-1.3] 2 commits: Minor fixes on date format

[Daniela Feitosa]

Daniela Feitosa pushed to branch stable-1.3 at Noosfero / noosfero


Commits:
6703903a by Tallys Martins at 2016-01-20T15:36:08-02:00
Minor fixes on date format

 - also fixes one broken test on content_viewer_controller

Signed-off-by: Tallys Martins <tallysmartins at yahoo.com.br>

- - - - -
f170cd12 by Daniela Feitosa at 2016-01-25T13:06:55+00:00
Merge branch 'event_fixes' into 'stable-1.3'

Minor fixes on date format

- also fixes one broken test on content_viewer_controller

Signed-off-by: Tallys Martins <tallysmartins at yahoo.com.br>

Included on master on 7be7e7c6a7475d0085a7a0759b5ec45f237fb4b2

See merge request !767
- - - - -


2 changed files:

- app/helpers/forms_helper.rb
- test/functional/content_viewer_controller_test.rb


Changes:

=====================================
app/helpers/forms_helper.rb
=====================================
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.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


=====================================
test/functional/content_viewer_controller_test.rb
=====================================
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -1163,9 +1163,10 @@ class ContentViewerControllerTest < 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
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/b7fa995c4d47a43210de4743efb849586b079546...f170cd126e817b1d4a8d01a3b22785532e71ef26
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160125/8f1dcead/attachment.html>