Merge branch 'master' into staging

Victor Costa
2 parents 89ca98f6 9db0c7d6
Showing 6 changed files with 49 additions and 25 deletions Show diff stats
app/api/entities.rb
app/api/v1/blocks.rb
app/views/profile/send_mail.html.erb
po/es/noosfero.po
test/api/blocks_test.rb
test/api/boxes_test.rb
@@ -97,7 +97,7 @@ module Api
       root 'boxes', 'box'
       expose :id, :position
       expose :blocks, :using => Block do |box, options|
-        box.blocks.select {|block| block.visible_to_user?(options[:current_person]) }
+        box.blocks.select {|block| block.visible_to_user?(options[:current_person]) || block.allow_edit?(options[:current_person]) }
       end
     end
@@ -5,7 +5,7 @@ module Api
       resource :blocks do
         get ':id' do
           block = Block.find(params["id"])
-          return forbidden! unless block.visible_to_user?(current_person)
+          return forbidden! unless block.visible_to_user?(current_person) || block.allow_edit?(current_person)
           present block, :with => Entities::Block, display_api_content: true, current_person: current_person
         end
@@ -15,8 +15,8 @@
 <div class="template-selection">
   <% if @email_templates.present? %>
     <%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
-  </div>
-<% end %>
+  <% end %>
+</div>
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-8-g01ea9f7\n"
 "POT-Creation-Date: 2015-11-04 12:36-0300\n"
-"PO-Revision-Date: 2016-06-15 13:11+0000\n"
+"PO-Revision-Date: 2016-06-15 13:24+0000\n"
 "Last-Translator: Becca Cook <b.cook28@gmail.com>\n"
 "Language-Team: Spanish "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/es/>\n"
@@ -7508,22 +7508,21 @@ msgstr &quot;Administrar campos mostrados para perfiles&quot;
 #: app/views/features/manage_fields.html.erb:6
 #, fuzzy
 msgid "Person's fields"
-msgstr "Manejar los campos de personas"
+msgstr "Los campos de personas"
 #: app/views/features/manage_fields.html.erb:8
 #, fuzzy
 msgid "Community's fields"
-msgstr "Perfil de la comunidad"
+msgstr "Campos de la comunidad"
 #: app/views/features/manage_fields.html.erb:11
 #, fuzzy
 msgid "Enterprise's fields"
-msgstr "Perfil de empresas"
+msgstr "Campos de empresas"
 #: app/views/file_presenter/_generic.html.erb:5
-#, fuzzy
 msgid "Download"
-msgstr "Abajo"
+msgstr "Descargar"
 #: app/views/file_presenter/_image.html.erb:7
 #: app/views/file_presenter/_image.html.erb:9
@@ -7552,9 +7551,8 @@ msgstr &quot;Contenido etiquetado con \&quot;%s\&quot;&quot;
 #: app/views/friends/connections.html.erb:4
 #: app/views/friends/suggest.html.erb:4
-#, fuzzy
 msgid "Go to friends list"
-msgstr "No tienes nuevos amigos aun."
+msgstr "Ir a la lista de amigos"
 #: app/views/friends/index.html.erb:3 app/views/profile/friends.html.erb:3
 msgid "%s's friends"
@@ -7577,12 +7575,11 @@ msgstr &quot;Encontrar gente&quot;
 #: app/views/profile/friends.html.erb:21
 #, fuzzy
 msgid "Invite people"
-msgstr "Invitar miembros"
+msgstr "Invitar gente"
 #: app/views/friends/index.html.erb:31
-#, fuzzy
 msgid "Friends suggestions"
-msgstr "Sugerencia de artículos"
+msgstr "Sugerencias de amigos"
 #: app/views/friends/remove.html.erb:3
 msgid "Removing friend: %s"
@@ -7601,14 +7598,12 @@ msgstr &quot;&quot;
 "también quiera eliminarte de su lista de amigos."
 #: app/views/friends/remove_suggestion.html.erb:2
-#, fuzzy
 msgid "Removing suggestion for friend: %s"
-msgstr "Eliminando amigo: %s"
+msgstr "Eliminando sugerencia de amigo: %s"
 #: app/views/friends/suggest.html.erb:1
-#, fuzzy
 msgid "Friends suggestions for %s"
-msgstr "Ajustes de perfil para %s"
+msgstr "Sugerencias de amigos para %s"
 #: app/views/home/index.html.erb:2
 msgid "News"
@@ -7661,15 +7656,18 @@ msgid &quot;user&quot;
 msgstr "usuario"
 #: app/views/home/welcome.html.erb:15
+#, fuzzy
 msgid "Wait for admin approvement!"
-msgstr ""
+msgstr "¡Espera que la admin lo apruebe!"
 #: app/views/home/welcome.html.erb:16
+#, fuzzy
 msgid "The administrators will evaluate your signup request for approvement."
 msgstr ""
+"Los administradores van a evaluar tu solicitud de inscripción para "
+"aprobación."
 #: app/views/home/welcome.html.erb:17
-#, fuzzy
 msgid "You won't appear as %s until your account is approved."
 msgstr "No aparecerás como %s hasta que tu cuenta sea confirmada."
@@ -7678,14 +7676,18 @@ msgid &quot;What to do next?&quot;
 msgstr "¿Qué hacer después?"
 #: app/views/home/welcome.html.erb:20
+#, fuzzy
 msgid "Access your %s and see your face on the network!"
-msgstr ""
+msgstr "¡Acceder tu %s y ver tu cara en la red!"
 #: app/views/home/welcome.html.erb:22
+#, fuzzy
 msgid ""
 "You can also explore your %s to customize your profile. Here are some %s on "
 "what you can do there."
 msgstr ""
+"También puedes explorar tu %s para personalizar tu perfil. Aquí están "
+"algunos %s de qué puedes hacer allí."
 #: app/views/home/welcome.html.erb:23
 #: app/views/profile_editor/index.html.erb:6
@@ -7694,7 +7696,7 @@ msgstr &quot;Panel de control&quot;
 #: app/views/home/welcome.html.erb:24
 msgid "tips"
-msgstr ""
+msgstr "consejos"
 #: app/views/home/welcome.html.erb:25
 msgid "Invite and find"
@@ -7721,7 +7723,7 @@ msgstr &quot;¡Comienza explorando y diviértete!&quot;
 #: app/views/home/welcome.html.erb:29
 msgid "What can I do as a %s?"
-msgstr ""
+msgstr "¿Qué puedo hacer como un %s?"
 #: app/views/invite/_dialog_wait_loading.html.erb:8
 msgid "Please, wait..."
@@ -7792,7 +7794,7 @@ msgstr &quot;&quot;
 #: app/views/invite/invite_friends.html.erb:2
 #, fuzzy
 msgid "Ask for friendship"
-msgstr "%s amigos"
+msgstr "Pedir la amistad"
 #: app/views/invite/invite_friends.html.erb:3
 msgid "You can search for user profiles and ask them to become your friends."
@@ -53,6 +53,16 @@ class BlocksTest &lt; ActiveSupport::TestCase
     assert_equal 403, last_response.status
   end
+  should 'get an invisible profile block for an user with permission' do
+    profile = fast_create(Profile, public_profile: false)
+    profile.add_admin(person)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal block.id, json["block"]["id"]
+  end
+
   should 'get a block for an user with permission in a private profile' do
     profile = fast_create(Profile, public_profile: false)
     profile.add_admin(person)
@@ -81,6 +81,18 @@ class BoxesTest &lt; ActiveSupport::TestCase
     assert_equal [block.id], json["boxes"].first["blocks"].map {|b| b['id']}
   end
+  should 'list a block with not logged in display_user for an admin user' do
+    profile = fast_create(Profile)
+    profile.add_admin(person)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    block.display_user = 'not_logged'
+    block.save!
+    get "/api/v1/profiles/#{profile.id}/boxes?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal [block.id], json["boxes"].first["blocks"].map {|b| b['id']}
+  end
+
   should 'not list boxes for user without permission' do
     profile = fast_create(Profile, public_profile: false)
     box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
	@@ -97,7 +97,7 @@ module Api		@@ -97,7 +97,7 @@ module Api
97	root 'boxes', 'box'	97	root 'boxes', 'box'
98	expose :id, :position	98	expose :id, :position
99	expose :blocks, :using => Block do \|box, options\|	99	expose :blocks, :using => Block do \|box, options\|
100	- box.blocks.select {\|block\| block.visible_to_user?(options[:current_person]) }	100	+ box.blocks.select {\|block\| block.visible_to_user?(options[:current_person]) \|\| block.allow_edit?(options[:current_person]) }
101	end	101	end
102	end	102	end
103		103
	@@ -5,7 +5,7 @@ module Api		@@ -5,7 +5,7 @@ module Api
5	resource :blocks do	5	resource :blocks do
6	get ':id' do	6	get ':id' do
7	block = Block.find(params["id"])	7	block = Block.find(params["id"])
8	- return forbidden! unless block.visible_to_user?(current_person)	8	+ return forbidden! unless block.visible_to_user?(current_person) \|\| block.allow_edit?(current_person)
9	present block, :with => Entities::Block, display_api_content: true, current_person: current_person	9	present block, :with => Entities::Block, display_api_content: true, current_person: current_person
10	end	10	end
11		11
	@@ -53,6 +53,16 @@ class BlocksTest < ActiveSupport::TestCase		@@ -53,6 +53,16 @@ class BlocksTest < ActiveSupport::TestCase
53	assert_equal 403, last_response.status	53	assert_equal 403, last_response.status
54	end	54	end
55		55
		56	+ should 'get an invisible profile block for an user with permission' do
		57	+ profile = fast_create(Profile, public_profile: false)
		58	+ profile.add_admin(person)
		59	+ box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
		60	+ block = fast_create(Block, box_id: box.id)
		61	+ get "/api/v1/blocks/#{block.id}?#{params.to_query}"
		62	+ json = JSON.parse(last_response.body)
		63	+ assert_equal block.id, json["block"]["id"]
		64	+ end
		65	+
56	should 'get a block for an user with permission in a private profile' do	66	should 'get a block for an user with permission in a private profile' do
57	profile = fast_create(Profile, public_profile: false)	67	profile = fast_create(Profile, public_profile: false)
58	profile.add_admin(person)	68	profile.add_admin(person)
	@@ -81,6 +81,18 @@ class BoxesTest < ActiveSupport::TestCase		@@ -81,6 +81,18 @@ class BoxesTest < ActiveSupport::TestCase
81	assert_equal [block.id], json["boxes"].first["blocks"].map {\|b\| b['id']}	81	assert_equal [block.id], json["boxes"].first["blocks"].map {\|b\| b['id']}
82	end	82	end
83		83
		84	+ should 'list a block with not logged in display_user for an admin user' do
		85	+ profile = fast_create(Profile)
		86	+ profile.add_admin(person)
		87	+ box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
		88	+ block = fast_create(Block, box_id: box.id)
		89	+ block.display_user = 'not_logged'
		90	+ block.save!
		91	+ get "/api/v1/profiles/#{profile.id}/boxes?#{params.to_query}"
		92	+ json = JSON.parse(last_response.body)
		93	+ assert_equal [block.id], json["boxes"].first["blocks"].map {\|b\| b['id']}
		94	+ end
		95	+
84	should 'not list boxes for user without permission' do	96	should 'not list boxes for user without permission' do
85	profile = fast_create(Profile, public_profile: false)	97	profile = fast_create(Profile, public_profile: false)
86	box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)	98	box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)