Merge remote-tracking branch 'origin/master'

Weblate
2 parents 318126fe 57e4738a
Showing 8 changed files with 39 additions and 16 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/layout_helper.rb
app/models/user.rb
app/views/layouts/application-ng.html.erb
lib/user_activation_job.rb
public/designs/themes/base/footer.html.erb
test/unit/user_activation_job_test.rb
test/unit/user_test.rb
@@ -907,13 +907,15 @@ module ApplicationHelper
   end
  
   def page_title
-    (@page ? @page.title + ' - ' : '') +
-    (@topic ? @topic.title + ' - ' : '') +
-    (@section ? @section.title + ' - ' : '') +
-    (@toc ? _('Online Manual') + ' - ' : '') +
-    (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
-    (profile ? profile.short_name : environment.name) +
-    (@category ? " - #{@category.full_name}" : '')
+    CGI.escapeHTML(
+      (@page ? @page.title + ' - ' : '') +
+      (@topic ? @topic.title + ' - ' : '') +
+      (@section ? @section.title + ' - ' : '') +
+      (@toc ? _('Online Manual') + ' - ' : '') +
+      (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
+      (profile ? profile.short_name : environment.name) +
+      (@category ? " - #{@category.full_name}" : '')
+    )
   end
  
   # DEPRECATED. Do not use this.
@@ -1285,11 +1287,13 @@ module ApplicationHelper
   end
  
   def delete_article_message(article)
-    if article.folder?
-      _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
-    else
-      _("Are you sure that you want to remove the item \"%s\"?") % article.name
-    end
+    CGI.escapeHTML(
+      if article.folder?
+        _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
+      else
+        _("Are you sure that you want to remove the item \"%s\"?") % article.name
+      end
+    )
   end
  
   def expirable_link_to(expired, content, url, options = {})
@@ -91,7 +91,7 @@ module LayoutHelper
   end
  
   def meta_description_tag(article=nil)
-    article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
+    article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
   end
 end
  
@@ -350,6 +350,7 @@ class User &lt; ActiveRecord::Base
     end
  
     def delay_activation_check
+      return if person.is_template?
       Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
     end
 end
@@ -17,7 +17,7 @@
     <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
     <meta property="og:title" content="<%= h page_title %>">
     <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
-    <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
+    <meta property="og:description" content="<%= meta_description_tag(@page) %>">
  
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
 class UserActivationJob < Struct.new(:user_id)
   def perform
     user = User.find(user_id)
-    user.destroy unless user.activated?
+    user.destroy unless user.activated? || user.person.is_template?
   end
 end
 <div id="footer-links">
-  <a id="link-to-doc" class='icon-help'><%= link_to _('Manual'), '/doc' %></a>
+  <%= link_to _('Manual'), '/doc', id: "link-to-doc", class: 'icon-help' %>
 </div><!-- end id="footer-links" -->
 <div id="copyright">
   <p><%= _('This social network uses <a href="http://noosfero.org/">Noosfero</a>, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>
@@ -29,6 +29,17 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'not destroy user if not activated but is template' do
+    user = new_user :login => 'test3'
+    user.person.is_template = true
+    user.person.save
+    job = UserActivationJob.new(user.id)
+    assert_no_difference 'User.count' do
+      job.perform
+      process_delayed_job_queue
+    end
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
@@ -525,6 +525,13 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_match /UserActivationJob/, Delayed::Job.last.handler
   end
  
+  should 'not create job to check activation to template users' do
+    Person.any_instance.stubs(:is_template?).returns(true)
+
+    user = new_user
+    assert_equal 0, Delayed::Job.by_handler("--- !ruby/struct:UserActivationJob\nuser_id: #{user.id}\n").count
+  end
+
   should 'deactivate an user' do
     user = new_user
     user.activate
...	...	@@ -907,13 +907,15 @@ module ApplicationHelper
907	907	end
908	908
909	909	def page_title
910		- (@page ? @page.title + ' - ' : '') +
911		- (@topic ? @topic.title + ' - ' : '') +
912		- (@section ? @section.title + ' - ' : '') +
913		- (@toc ? _('Online Manual') + ' - ' : '') +
914		- (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
915		- (profile ? profile.short_name : environment.name) +
916		- (@category ? " - #{@category.full_name}" : '')
	910	+ CGI.escapeHTML(
	911	+ (@page ? @page.title + ' - ' : '') +
	912	+ (@topic ? @topic.title + ' - ' : '') +
	913	+ (@section ? @section.title + ' - ' : '') +
	914	+ (@toc ? _('Online Manual') + ' - ' : '') +
	915	+ (controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
	916	+ (profile ? profile.short_name : environment.name) +
	917	+ (@category ? " - #{@category.full_name}" : '')
	918	+ )
917	919	end
918	920
919	921	# DEPRECATED. Do not use this.
...	...	@@ -1285,11 +1287,13 @@ module ApplicationHelper
1285	1287	end
1286	1288
1287	1289	def delete_article_message(article)
1288		- if article.folder?
1289		- _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
1290		- else
1291		- _("Are you sure that you want to remove the item \"%s\"?") % article.name
1292		- end
	1290	+ CGI.escapeHTML(
	1291	+ if article.folder?
	1292	+ _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
	1293	+ else
	1294	+ _("Are you sure that you want to remove the item \"%s\"?") % article.name
	1295	+ end
	1296	+ )
1293	1297	end
1294	1298
1295	1299	def expirable_link_to(expired, content, url, options = {})
...	...
...	...	@@ -91,7 +91,7 @@ module LayoutHelper
91	91	end
92	92
93	93	def meta_description_tag(article=nil)
94		- article ? truncate(strip_tags(article.body.to_s), :length => 200) : environment.name
	94	+ article ? CGI.escapeHTML(truncate(strip_tags(article.body.to_s), :length => 200)) : environment.name
95	95	end
96	96	end
97	97
...	...
...	...	@@ -350,6 +350,7 @@ class User < ActiveRecord::Base
350	350	end
351	351
352	352	def delay_activation_check
	353	+ return if person.is_template?
353	354	Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => 72.hours.from_now})
354	355	end
355	356	end
...	...
...	...	@@ -17,7 +17,7 @@
17	17	<meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
18	18	<meta property="og:title" content="<%= h page_title %>">
19	19	<meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
20		- <meta property="og:description" content="<%= @page ? truncate(strip_tags(@page.body.to_s), :length => 200) : @environment.name %>">
	20	+ <meta property="og:description" content="<%= meta_description_tag(@page) %>">
21	21
22	22	<!-- site root -->
23	23	<meta property="noosfero:root" content="<%= Noosfero.root %>"/>
...	...
1	1	class UserActivationJob < Struct.new(:user_id)
2	2	def perform
3	3	user = User.find(user_id)
4		- user.destroy unless user.activated?
	4	+ user.destroy unless user.activated? \|\| user.person.is_template?
5	5	end
6	6	end
...	...
1	1	<div id="footer-links">
2		- <a id="link-to-doc" class='icon-help'><%= link_to _('Manual'), '/doc' %></a>
	2	+ <%= link_to _('Manual'), '/doc', id: "link-to-doc", class: 'icon-help' %>
3	3	</div><!-- end id="footer-links" -->
4	4	<div id="copyright">
5	5	<p><%= _('This social network uses <a href="http://noosfero.org/">Noosfero</a>, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>
...	...
...	...	@@ -29,6 +29,17 @@ class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
29	29	end
30	30	end
31	31
	32	+ should 'not destroy user if not activated but is template' do
	33	+ user = new_user :login => 'test3'
	34	+ user.person.is_template = true
	35	+ user.person.save
	36	+ job = UserActivationJob.new(user.id)
	37	+ assert_no_difference 'User.count' do
	38	+ job.perform
	39	+ process_delayed_job_queue
	40	+ end
	41	+ end
	42	+
32	43	protected
33	44	def new_user(options = {})
34	45	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
...	...
...	...	@@ -525,6 +525,13 @@ class UserTest < ActiveSupport::TestCase
525	525	assert_match /UserActivationJob/, Delayed::Job.last.handler
526	526	end
527	527
	528	+ should 'not create job to check activation to template users' do
	529	+ Person.any_instance.stubs(:is_template?).returns(true)
	530	+
	531	+ user = new_user
	532	+ assert_equal 0, Delayed::Job.by_handler("--- !ruby/struct:UserActivationJob\nuser_id: #{user.id}\n").count
	533	+ end
	534	+
528	535	should 'deactivate an user' do
529	536	user = new_user
530	537	user.activate
...	...