Merge branch 'master' into staging

Leandro Santos
2 parents 7b9da6d6 2276f138
Showing 12 changed files with 62 additions and 26 deletions Show diff stats
app/api/helpers.rb
app/api/v1/profiles.rb
app/models/organization.rb
plugins/community_track/views/blocks/_track.html.erb
plugins/community_track/views/content_viewer/_step_item.html.erb
plugins/community_track/views/content_viewer/step.html.erb
plugins/community_track/views/content_viewer/track.html.erb
plugins/organization_ratings/views/shared/_user_rating_container.html.erb
spec/fixtures
spec/spec_helper.rb
spec/support
test/api/profiles_test.rb
@@ -447,12 +447,12 @@ module Api
     end
     def asset_with_image params
-      if params.has_key? :image_builder
+      if !params.nil? && params.has_key?(:image_builder)
         asset_api_params = params
         asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])
         return asset_api_params
       end
-        params
+      params
     end
     def base64_to_uploadedfile(base64_image)
@@ -28,7 +28,7 @@ module Api
           authenticate!
           profile = environment.profiles.find_by(id: params[:id])
           return forbidden! unless profile.allow_edit?(current_person)
-          profile.update_attributes!(params[:profile])
+          profile.update_attributes!(asset_with_image(params[:profile]))
           present profile, :with => Entities::Profile, :current_person => current_person
         end
@@ -20,33 +20,28 @@ class Organization &lt; Profile
   #   visible.
   #   4) The user is not a member of the organization but the organization is
   #   visible, public and enabled.
-  def self.listed_for_person(person)
+  scope :listed_for_person, lambda { |person|
+
     joins('LEFT JOIN "role_assignments" ON ("role_assignments"."resource_id" = "profiles"."id"
           AND "role_assignments"."resource_type" = \'Profile\') OR (
           "role_assignments"."resource_id" = "profiles"."environment_id" AND
           "role_assignments"."resource_type" = \'Environment\' )')
     .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
     .where(
-      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? )
-        OR
-        ( ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR
-            ( profiles.enabled = ? ) ) AND
-          ( profiles.visible = ? ) )',
-      'profile_admin', 'environment_administrator', Profile.name, person.id,
-      Profile.name, person.id, true, true]
-    ).uniq
-  end
-
-  def self.visible_for_person(person)
-    listed_for_person(person).where(
-      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? )
-        OR
+      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
+        ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR ( profiles.enabled = ?)) AND (profiles.visible = ?) )',
+         'profile_admin', 'environment_administrator', Profile.name, person.id, Profile.name, person.id,  true, true]
+     ).uniq
+  }
+
+  scope :visible_for_person, lambda { |person|
+	    listed_for_person(person).where( ['
         ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR
-          ( profiles.enabled = ? AND profiles.public_profile = ? ) )',
-      'profile_admin', 'environment_administrator', Profile.name, person.id,
+          ( profiles.enabled = ? AND profiles.public_profile = ? ) )',      
       Profile.name, person.id,  true, true]
     )
-  end
+  }
+
   settings_items :closed, :type => :boolean, :default => false
   def closed?
@@ -5,7 +5,7 @@
     <div class="lead">
       <h3><%= link_to track.name, track.url %></h3>
       <div class="content">
-        <%= track.lead %>
+        <%= track.lead.html_safe %>
       </div>
     </div>
     <div class="steps">
@@ -10,7 +10,7 @@
         <%= status_description(step_item) %>
       </div>
       <div class="name"><span class="tool_icon button with-text icon-new icon-new<%= step_item.tool_class.icon_name if step_item.tool_class %>"></span>  <%= step_item.name %></div>
-      <div class="lead"><%= step_item.body %></div>
+      <div class="lead"><%= step_item.body.html_safe %></div>
       <div class="tools">
         <% if step_item.tool %>
           <%= _('Tool: ') %>
@@ -7,7 +7,7 @@
     </ul>
   </div>
   <div>
-    <%= step.body %>
+    <%= step.body.html_safe %>
   </div>
   <% if step.allow_create?(user) && !step.tool && step.tool_class %>
     <h3><%= _("Tool") %></h3>
@@ -3,7 +3,7 @@
 <%= form_tag({:controller => 'community_track_plugin_myprofile', :action => 'save_order', :track => track}) do %>
 <div id="track">
   <div>
-    <%= track.body %>
+    <%= track.body.html_safe %>
   </div>
   <h3><%= _("Steps") %></h3>
@@ -31,7 +31,7 @@
         <p class="comment-body"> <%= user_rate.comment.body %> </p>
       <% elsif user && user.is_admin? %>
         <% rating_task = CreateOrganizationRatingComment.with_rating(user_rate) %>
-        <p class="comment-body"> <%= rating_task.body %> </p>
+        <p class="comment-body"> <%= rating_task.body if rating_task.respond_to?(:body) %> </p>
       <% end %>
     </div>
     <%= @plugins.dispatch(:organization_ratings_plugin_container_extra_fields, user_rate).collect { |content| instance_exec(&content) }.join("") %>
@@ -0,0 +1 @@
+../test/fixtures
 \ No newline at end of file
@@ -0,0 +1,25 @@
+require_relative '../config/environment'
+require 'rspec/rails'
+
+require_relative 'support/factories'
+
+require 'database_cleaner'
+
+RSpec.configure do |config|
+
+  config.fixture_path = 'spec/fixtures'
+
+  config.include Noosfero::Factory
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with :truncation
+  end
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
+
+end
+
@@ -0,0 +1 @@
+../test/support
 \ No newline at end of file
@@ -218,4 +218,18 @@ class ProfilesTest &lt; ActiveSupport::TestCase
     json = JSON.parse(last_response.body)
     assert_includes json["permissions"], 'allow_post_content'
   end
+
+  should 'update profile image' do
+    login_api
+    community = fast_create(Community)
+    community.add_member(person)
+    base64_image = create_base64_image
+    params.merge!({profile: {image_builder: base64_image}})
+    assert_nil person.image
+    post "/api/v1/profiles/#{community.id}?#{params.to_query}"
+    community.reload
+    assert_not_nil community.image
+    assert_equal community.image.filename, base64_image[:filename]
+  end
+
 end
	@@ -447,12 +447,12 @@ module Api		@@ -447,12 +447,12 @@ module Api
447	end	447	end
448		448
449	def asset_with_image params	449	def asset_with_image params
450	- if params.has_key? :image_builder	450	+ if !params.nil? && params.has_key?(:image_builder)
451	asset_api_params = params	451	asset_api_params = params
452	asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])	452	asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])
453	return asset_api_params	453	return asset_api_params
454	end	454	end
455	- params	455	+ params
456	end	456	end
457		457
458	def base64_to_uploadedfile(base64_image)	458	def base64_to_uploadedfile(base64_image)
	@@ -28,7 +28,7 @@ module Api		@@ -28,7 +28,7 @@ module Api
28	authenticate!	28	authenticate!
29	profile = environment.profiles.find_by(id: params[:id])	29	profile = environment.profiles.find_by(id: params[:id])
30	return forbidden! unless profile.allow_edit?(current_person)	30	return forbidden! unless profile.allow_edit?(current_person)
31	- profile.update_attributes!(params[:profile])	31	+ profile.update_attributes!(asset_with_image(params[:profile]))
32	present profile, :with => Entities::Profile, :current_person => current_person	32	present profile, :with => Entities::Profile, :current_person => current_person
33	end	33	end
34		34
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<div class="lead">	5	<div class="lead">
6	<h3><%= link_to track.name, track.url %></h3>	6	<h3><%= link_to track.name, track.url %></h3>
7	<div class="content">	7	<div class="content">
8	- <%= track.lead %>	8	+ <%= track.lead.html_safe %>
9	</div>	9	</div>
10	</div>	10	</div>
11	<div class="steps">	11	<div class="steps">
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	<%= status_description(step_item) %>	10	<%= status_description(step_item) %>
11	</div>	11	</div>
12	<div class="name"><span class="tool_icon button with-text icon-new icon-new<%= step_item.tool_class.icon_name if step_item.tool_class %>"></span> <%= step_item.name %></div>	12	<div class="name"><span class="tool_icon button with-text icon-new icon-new<%= step_item.tool_class.icon_name if step_item.tool_class %>"></span> <%= step_item.name %></div>
13	- <div class="lead"><%= step_item.body %></div>	13	+ <div class="lead"><%= step_item.body.html_safe %></div>
14	<div class="tools">	14	<div class="tools">
15	<% if step_item.tool %>	15	<% if step_item.tool %>
16	<%= _('Tool: ') %>	16	<%= _('Tool: ') %>
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	</ul>	7	</ul>
8	</div>	8	</div>
9	<div>	9	<div>
10	- <%= step.body %>	10	+ <%= step.body.html_safe %>
11	</div>	11	</div>
12	<% if step.allow_create?(user) && !step.tool && step.tool_class %>	12	<% if step.allow_create?(user) && !step.tool && step.tool_class %>
13	<h3><%= _("Tool") %></h3>	13	<h3><%= _("Tool") %></h3>
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	<%= form_tag({:controller => 'community_track_plugin_myprofile', :action => 'save_order', :track => track}) do %>	3	<%= form_tag({:controller => 'community_track_plugin_myprofile', :action => 'save_order', :track => track}) do %>
4	<div id="track">	4	<div id="track">
5	<div>	5	<div>
6	- <%= track.body %>	6	+ <%= track.body.html_safe %>
7	</div>	7	</div>
8		8
9	<h3><%= _("Steps") %></h3>	9	<h3><%= _("Steps") %></h3>
	@@ -31,7 +31,7 @@		@@ -31,7 +31,7 @@
31	<p class="comment-body"> <%= user_rate.comment.body %> </p>	31	<p class="comment-body"> <%= user_rate.comment.body %> </p>
32	<% elsif user && user.is_admin? %>	32	<% elsif user && user.is_admin? %>
33	<% rating_task = CreateOrganizationRatingComment.with_rating(user_rate) %>	33	<% rating_task = CreateOrganizationRatingComment.with_rating(user_rate) %>
34	- <p class="comment-body"> <%= rating_task.body %> </p>	34	+ <p class="comment-body"> <%= rating_task.body if rating_task.respond_to?(:body) %> </p>
35	<% end %>	35	<% end %>
36	</div>	36	</div>
37	<%= @plugins.dispatch(:organization_ratings_plugin_container_extra_fields, user_rate).collect { \|content\| instance_exec(&content) }.join("") %>	37	<%= @plugins.dispatch(:organization_ratings_plugin_container_extra_fields, user_rate).collect { \|content\| instance_exec(&content) }.join("") %>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../test/fixtures
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+require_relative '../config/environment'
	2	+require 'rspec/rails'
	3	+
	4	+require_relative 'support/factories'
	5	+
	6	+require 'database_cleaner'
	7	+
	8	+RSpec.configure do \|config\|
	9	+
	10	+ config.fixture_path = 'spec/fixtures'
	11	+
	12	+ config.include Noosfero::Factory
	13	+
	14	+ config.before(:suite) do
	15	+ DatabaseCleaner.strategy = :truncation
	16	+ DatabaseCleaner.clean_with :truncation
	17	+ end
	18	+ config.around(:each) do \|example\|
	19	+ DatabaseCleaner.cleaning do
	20	+ example.run
	21	+ end
	22	+ end
	23	+
	24	+end
	25	+
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../test/support
0	\ No newline at end of file	2	\ No newline at end of file