Merge branch 'stable-spb-1.3' of portal.softwarepublico.gov.br:softwarepublico/n…

…oosfero into stable-spb-1.3

Merge branch 'stable-spb-1.3' of portal.softwarepublico.gov.br:softwarepublico/n…
…oosfero into stable-spb-1.3
Thiago Ribeiro
2 parents 8b5c0bc7 f6eaf20a
Showing 7 changed files with 23 additions and 10 deletions Show diff stats
app/helpers/forms_helper.rb
plugins/organization_ratings/features/rate_community.feature
plugins/organization_ratings/style.css
plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
plugins/organization_ratings/views/shared/_make_report_block.html.erb
plugins/organization_ratings/views/shared/_user_rating_container.html.erb
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
@@ -28,3 +28,9 @@ Feature: rate_community
   Scenario: display rate button inside communities ratings block
     Given I am on mycommunity's homepage
     Then I should see "Rate Community" within ".make-report-block"
+
+  Scenario: redirect to profile page
+    Given I am on mycommunity's homepage
+    When I follow "Rate this Community"
+    Then I should see "Joao Silva" within ".star-profile-name"
+    And I should see Joao Silva's profile image
 \ No newline at end of file
@@ -122,6 +122,10 @@
   width: 66px;
 }
+.star-profile-name a:link {
+  text-decoration: none;
+}
+
 .star-rate-data .star-rate-form .star-comment-container .formfield textarea {
   width: 361px;
 }
@@ -9,11 +9,11 @@
   <div class="star-profile-information">
     <div class="star-profile-image">
-      <%= profile_image(current_user.person, :portrait) %>
+      <%= link_to profile_image(current_user.person, :portrait), current_user.person.url %>
     </div>
     <div class="star-profile-name">
-      <%= current_user.name %>
+      <%= link_to current_user.person.name,  current_user.person.url %>
     </div>
   </div>
-<% logged_in_image = profile_image(current_user.person, :portrait) if current_user %>
+<% logged_in_image = link_to profile_image(current_user.person, :portrait), current_user.person.url if current_user %>
+<% logged_in_name = link_to current_user.person.name,  current_user.person.url if current_user %>
 <% logged_out_image = image_tag('plugins/organization_ratings/public/images/user-not-logged.png') %>
 <div class="make-report-block">
@@ -8,7 +9,7 @@
     </div>
     <div class="star-profile-name">
-      <%= logged_in? ? current_user.person.name : _('User not logged') %>
+      <%= logged_in? ? logged_in_name : _('User not logged') %>
     </div>
   </div>
 <div class="user-rating-block">
   <div class="star-profile-information">
     <div class="star-profile-image">
-      <%= profile_image(user_rate.person, :portrait) %>
+      <%= link_to profile_image(user_rate.person, :portrait), user_rate.person.url %>
     </div>
     <div class="star-profile-name">
-      <%= user_rate.person.name %>
+      <%= link_to user_rate.person.name,  user_rate.person.url %>
     </div>
   </div>
@@ -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
	@@ -28,3 +28,9 @@ Feature: rate_community		@@ -28,3 +28,9 @@ Feature: rate_community
28	Scenario: display rate button inside communities ratings block	28	Scenario: display rate button inside communities ratings block
29	Given I am on mycommunity's homepage	29	Given I am on mycommunity's homepage
30	Then I should see "Rate Community" within ".make-report-block"	30	Then I should see "Rate Community" within ".make-report-block"
		31	+
		32	+ Scenario: redirect to profile page
		33	+ Given I am on mycommunity's homepage
		34	+ When I follow "Rate this Community"
		35	+ Then I should see "Joao Silva" within ".star-profile-name"
		36	+ And I should see Joao Silva's profile image
31	\ No newline at end of file	37	\ No newline at end of file
	@@ -9,11 +9,11 @@		@@ -9,11 +9,11 @@
9		9
10	<div class="star-profile-information">	10	<div class="star-profile-information">
11	<div class="star-profile-image">	11	<div class="star-profile-image">
12	- <%= profile_image(current_user.person, :portrait) %>	12	+ <%= link_to profile_image(current_user.person, :portrait), current_user.person.url %>
13	</div>	13	</div>
14		14
15	<div class="star-profile-name">	15	<div class="star-profile-name">
16	- <%= current_user.name %>	16	+ <%= link_to current_user.person.name, current_user.person.url %>
17	</div>	17	</div>
18	</div>	18	</div>
19		19
1	<div class="user-rating-block">	1	<div class="user-rating-block">
2	<div class="star-profile-information">	2	<div class="star-profile-information">
3	<div class="star-profile-image">	3	<div class="star-profile-image">
4	- <%= profile_image(user_rate.person, :portrait) %>	4	+ <%= link_to profile_image(user_rate.person, :portrait), user_rate.person.url %>
5	</div>	5	</div>
6		6
7	<div class="star-profile-name">	7	<div class="star-profile-name">
8	- <%= user_rate.person.name %>	8	+ <%= link_to user_rate.person.name, user_rate.person.url %>
9	</div>	9	</div>
10	</div>	10	</div>
11		11