Merge branch 'stable'

Joenio Costa
2 parents 46ab6d44 49e084f8
Showing 19 changed files with 127 additions and 17 deletions Show diff stats
HACKING
app/helpers/dates_helper.rb
app/helpers/forms_helper.rb
app/models/community.rb
app/models/create_community.rb
app/views/box_organizer/_article_block.rhtml
app/views/profile/_profile.rhtml
app/views/tasks/_suggest_article_accept_details.rhtml
debian/changelog
features/private_profile.feature
features/step_definitions/noosfero_steps.rb
features/suggest_article.feature
lib/noosfero.rb
po/pt/noosfero.po
public/javascripts/application.js
public/stylesheets/application.css
test/functional/environment_design_controller_test.rb
test/unit/dates_helper_test.rb
test/unit/forms_helper_test.rb
@@ -70,3 +70,17 @@ environment, you must run the delayed_job server like this:
  ./script/delayed_job run
 This will block your terminal. To stop the delayed_job server, hit Control-C.
+
+== Enabling exceptions notification
+
+By default, exception notifications are disabled in development environment. If
+you want to enable it then you need to change some files:
+
+1) Add in config/environments/development.rb:
+   config.action_controller.consider_all_requests_local = false
+
+2) Add in app/controller/application.rb:
+   local_addresses.clear
+
+3) Add in config/noosfero.yml at development section:
+   exception_recipients: [admin@example.com]
@@ -46,7 +46,7 @@ module DatesHelper
     if (date1 == date2) || (date2.nil?)
       show_date(date1)
     else
-      _('from %s to %s') % [show_date(date1), show_date(date2)]
+      _('from %{date1} to %{date2}') % {:date1 => show_date(date1), :date2 => show_date(date2)}
     end
   end
@@ -111,6 +111,18 @@ module FormsHelper
     ))
   end
+  def options_for_select_with_title(container, selected = nil)
+    container = container.to_a if Hash === container
+
+    options_for_select = container.inject([]) do |options, element|
+      text, value = option_text_and_value(element)
+      selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
+      options << %(<option title="#{html_escape(text.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute}>#{html_escape(text.to_s)}</option>)
+    end
+
+    options_for_select.join("\n")
+  end
+
 protected
   def self.next_id_number
     if defined? @@id_num
@@ -39,10 +39,6 @@ class Community &lt; Organization
     end
   end
-  def display_name
-    self.name
-  end
-
   def active_fields
     environment ? environment.active_community_fields : []
   end
@@ -74,10 +74,6 @@ class CreateCommunity &lt; Task
     true
   end
-  def display_name
-    self.name
-  end
-
   # tells if this request was rejected
   def rejected?
     self.status == Task::Status::CANCELLED
-
+<div class='article-block-edition'>
 <% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
   <p id='no_portal_community'>
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
 <% else %>
   <% articles = @block.available_articles.select {|article| !article.folder? } %>
-  <%= select('block', 'article_id', articles.map {|item| [ item.path, item.id]}) %>
+  <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]})) %>
 <% end %>
+</div>
@@ -10,7 +10,9 @@
     <% end %>
     <% if @profile.organization? %>
-      <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
+      <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
+        <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
+      <% end %>
       <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
     <% elsif @profile.person? %>
       <% if logged_in? && current_person.follows?(@profile) %>
@@ -5,6 +5,7 @@
 <%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
 <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
+<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
 <div>
   <%= labelled_form_field(_('Lead'), f.text_area(:article_abstract, :style => 'width: 482px; height: 200px;')) %>
+noosfero (0.28.3) unstable; urgency=low
+
+  * Bugfixes Version release. (Closes: AI#1837 AI#1857 AI#1656 AI#1750 AI#1846 AI#1853 AI#1841 AI#1847 AI#1812 AI#1858)
+
+ -- Joenio Costa <joenio@perl.org.br>  Fri, 11 Feb 2011 22:54:24 -0300
+
 noosfero (0.28.2) unstable; urgency=low
   * Bugfixes Version release.
@@ -29,3 +29,14 @@ Feature: private profiles
     And I follow "Add friend"
     When I go to shygirl's homepage
     Then I should not see "Add friend"
+
+  Scenario: viewing a private community profile shouldn't show the news if not logged or not a member
+    Given I am on Safernet's homepage
+    Then I should not see "What's new"
+    And I am logged in as "joao"
+    When I am on Safernet's homepage
+    Then I should not see "What's new"
+    And "joao" is a member of "Safernet"
+    When I am on Safernet's homepage
+    Then I should see "What's new"
+
@@ -337,3 +337,13 @@ Given /^the community &quot;(.+)&quot; is closed$/ do |community|
   community.closed = true
   community.save
 end
+
+Given /^someone suggested the following article to be published$/ do |table|
+  SuggestArticle.skip_captcha!
+  table.hashes.map{|item| item.dup}.each do |item|
+    target = Community[item.delete('target')]
+    task = SuggestArticle.create!(:target => target, :data => item)
+  end
+end
+
+
@@ -0,0 +1,23 @@
+Feature: suggest article
+  As a not logged user
+  I want to suggest an article
+  In order to share it with other users
+
+  Background:
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And "Joao Silva" is admin of "Sample Community"
+
+  Scenario: highlight an article before approval of a suggested article
+    Given someone suggested the following article to be published
+      | target           | article_name        | article_body                    | name | email            |
+      | sample-community | A suggested article | this is an article about whales | jose | jose@example.org |
+    When I am logged in as "joaosilva"
+    And I go to Sample Community's control panel
+    And I follow "Process requests"
+    And I should see "suggested the publication of the article"
+    Then I should see "Highlight this article" within ".task_box"
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.28.2'
+  VERSION = '0.28.3'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.28.0\n"
 "POT-Creation-Date: 2011-02-02 21:38-0300\n"
-"PO-Revision-Date: 2011-02-02 21:39-0300\n"
+"PO-Revision-Date: 2011-02-10 14:54-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
 "MIME-Version: 1.0\n"
@@ -1660,7 +1660,7 @@ msgstr &quot;O conteúdo aqui está disponível apenas para os amigos do(a) %s.&quot;
 #: app/controllers/public/profile_controller.rb:246
 msgid "The contents in this community is available to members only."
 msgstr ""
-"O conteúdo desta comuninidade está disponível apenas para os seus membros."
+"O conteúdo desta comunidade está disponível apenas para os seus membros."
 #: app/controllers/public/profile_controller.rb:252
 msgid ""
@@ -461,6 +461,7 @@ function new_qualifier_row(selector, select_qualifiers) {
 // controls the display of the login/logout stuff
 jQuery(function($) {
+  $.ajaxSetup({cache: false});
   $.getJSON('/account/user_data', function userDataCallBack(data) {
     if (data.login) {
       // logged in
@@ -2068,6 +2068,8 @@ input.disabled {
 .common-profile-list-block img {
   border: none;
+  width: 50px;
+  height: 50px;
 }
 .box-2 .common-profile-list-block span,
@@ -3942,6 +3944,15 @@ h1#agenda-title {
   margin: 5px 0px 5px 160px;
 }
+.controller-profile_design .article-block-edition select,
+.controller-profile_design .article-block-edition option {
+  width: 300px;
+}
+
+.controller-profile_design .article-block-edition option {
+  overflow-x: hidden;
+}
+
 /* ==> public/stylesheets/controller_profile_editor.css <== */
 .controller-profile_editor .categorie_box .button {
@@ -5511,6 +5522,8 @@ h1#agenda-title {
   padding: 1px;
   border: 1px solid #ccc;
   margin: 4px 3px 0 0;
+  width: 20px;
+  height: 20px;
 }
 .profile-wall-image {
@@ -5536,6 +5549,12 @@ h1#agenda-title {
   text-align: center;
 }
+#profile-network .upload_image .profile-network-text span img,
+#profile-activity .upload_image .profile-activity-text span img {
+  width: auto;
+  height: auto;
+}
+
 #profile-network .upload_image .profile-network-text img,
 #profile-activity .upload_image .profile-activity-text img {
   padding: 0;
@@ -70,7 +70,7 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
     article.expects(:path).returns('some_path')
     article.expects(:id).returns(1)
     get :edit, :id => l.id
-    assert_tag :tag => 'select', :attributes => { :id => 'block_article_id' }
+    assert_tag :tag => 'select', :attributes => { :id => 'block[article_id]' }
   end
   should 'be able to edit ArticleBlock without portal community' do
@@ -20,7 +20,7 @@ class DatesHelperTest &lt; Test::Unit::TestCase
     expects(:show_date).with(date1).returns('XXX')
     date2 = mock
     expects(:show_date).with(date2).returns('YYY')
-    expects(:_).with('from %s to %s').returns('from %s to %s')
+    expects(:_).with('from %{date1} to %{date2}').returns('from %{date1} to %{date2}')
     assert_equal 'from XXX to YYY', show_period(date1, date2)
   end
@@ -36,6 +36,18 @@ class DatesHelperTest &lt; Test::Unit::TestCase
     assert_equal 'XXX', show_period(date1)
   end
+  should 'not crash with events that have start_date and end_date' do
+    FastGettext.default_text_domain = 'noosferofull'
+    assert_nothing_raised do
+      Noosfero.locales.keys.each do |key|
+        Noosfero.with_locale(key) do
+          show_period(Date.today, Date.tomorrow)
+        end
+      end
+    end
+    FastGettext.default_text_domain = 'noosferotest'
+  end
+
   should 'show day of week' do
     expects(:_).with("Sunday").returns("Domingo")
     date = mock
@@ -4,6 +4,7 @@ class FormsHelperTest &lt; Test::Unit::TestCase
   include FormsHelper
   include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormOptionsHelper
   should 'wrapper required fields in <span class=required-field>' do
     content = required('<input type=text name=test>')
@@ -20,6 +21,11 @@ class FormsHelperTest &lt; Test::Unit::TestCase
     assert_tag_in_string content, :tag => 'label', :content => 'highlighted', :attributes => {:class => 'pseudoformlabel'}
   end
+  should 'show title for option in select' do
+    content = options_for_select_with_title({'option_value' => 'option_title'})
+    assert_tag_in_string content, :tag => 'option', :attributes => {:title => 'option_value'}
+  end
+
   protected
   def _(text)
	@@ -70,3 +70,17 @@ environment, you must run the delayed_job server like this:		@@ -70,3 +70,17 @@ environment, you must run the delayed_job server like this:
70	./script/delayed_job run	70	./script/delayed_job run
71		71
72	This will block your terminal. To stop the delayed_job server, hit Control-C.	72	This will block your terminal. To stop the delayed_job server, hit Control-C.
		73	+
		74	+== Enabling exceptions notification
		75	+
		76	+By default, exception notifications are disabled in development environment. If
		77	+you want to enable it then you need to change some files:
		78	+
		79	+1) Add in config/environments/development.rb:
		80	+ config.action_controller.consider_all_requests_local = false
		81	+
		82	+2) Add in app/controller/application.rb:
		83	+ local_addresses.clear
		84	+
		85	+3) Add in config/noosfero.yml at development section:
		86	+ exception_recipients: [admin@example.com]
	@@ -46,7 +46,7 @@ module DatesHelper		@@ -46,7 +46,7 @@ module DatesHelper
46	if (date1 == date2) \|\| (date2.nil?)	46	if (date1 == date2) \|\| (date2.nil?)
47	show_date(date1)	47	show_date(date1)
48	else	48	else
49	- _('from %s to %s') % [show_date(date1), show_date(date2)]	49	+ _('from %{date1} to %{date2}') % {:date1 => show_date(date1), :date2 => show_date(date2)}
50	end	50	end
51	end	51	end
52		52
	@@ -111,6 +111,18 @@ module FormsHelper		@@ -111,6 +111,18 @@ module FormsHelper
111	))	111	))
112	end	112	end
113		113
		114	+ def options_for_select_with_title(container, selected = nil)
		115	+ container = container.to_a if Hash === container
		116	+
		117	+ options_for_select = container.inject([]) do \|options, element\|
		118	+ text, value = option_text_and_value(element)
		119	+ selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
		120	+ options << %(<option title="#{html_escape(text.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute}>#{html_escape(text.to_s)}</option>)
		121	+ end
		122	+
		123	+ options_for_select.join("\n")
		124	+ end
		125	+
114	protected	126	protected
115	def self.next_id_number	127	def self.next_id_number
116	if defined? @@id_num	128	if defined? @@id_num
	@@ -5,6 +5,7 @@		@@ -5,6 +5,7 @@
5	<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>	5	<%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
6		6
7	<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>	7	<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %>
		8	+<%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
8		9
9	<div>	10	<div>
10	<%= labelled_form_field(_('Lead'), f.text_area(:article_abstract, :style => 'width: 482px; height: 200px;')) %>	11	<%= labelled_form_field(_('Lead'), f.text_area(:article_abstract, :style => 'width: 482px; height: 200px;')) %>
		1	+noosfero (0.28.3) unstable; urgency=low
		2	+
		3	+ * Bugfixes Version release. (Closes: AI#1837 AI#1857 AI#1656 AI#1750 AI#1846 AI#1853 AI#1841 AI#1847 AI#1812 AI#1858)
		4	+
		5	+ -- Joenio Costa <joenio@perl.org.br> Fri, 11 Feb 2011 22:54:24 -0300
		6	+
1	noosfero (0.28.2) unstable; urgency=low	7	noosfero (0.28.2) unstable; urgency=low
2		8
3	* Bugfixes Version release.	9	* Bugfixes Version release.
	@@ -29,3 +29,14 @@ Feature: private profiles		@@ -29,3 +29,14 @@ Feature: private profiles
29	And I follow "Add friend"	29	And I follow "Add friend"
30	When I go to shygirl's homepage	30	When I go to shygirl's homepage
31	Then I should not see "Add friend"	31	Then I should not see "Add friend"
		32	+
		33	+ Scenario: viewing a private community profile shouldn't show the news if not logged or not a member
		34	+ Given I am on Safernet's homepage
		35	+ Then I should not see "What's new"
		36	+ And I am logged in as "joao"
		37	+ When I am on Safernet's homepage
		38	+ Then I should not see "What's new"
		39	+ And "joao" is a member of "Safernet"
		40	+ When I am on Safernet's homepage
		41	+ Then I should see "What's new"
		42	+
	@@ -337,3 +337,13 @@ Given /^the community "(.+)" is closed$/ do \|community\|		@@ -337,3 +337,13 @@ Given /^the community "(.+)" is closed$/ do \|community\|
337	community.closed = true	337	community.closed = true
338	community.save	338	community.save
339	end	339	end
		340	+
		341	+Given /^someone suggested the following article to be published$/ do \|table\|
		342	+ SuggestArticle.skip_captcha!
		343	+ table.hashes.map{\|item\| item.dup}.each do \|item\|
		344	+ target = Community[item.delete('target')]
		345	+ task = SuggestArticle.create!(:target => target, :data => item)
		346	+ end
		347	+end
		348	+
		349	+
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+Feature: suggest article
	2	+ As a not logged user
	3	+ I want to suggest an article
	4	+ In order to share it with other users
	5	+
	6	+ Background:
	7	+ Given the following users
	8	+ \| login \| name \|
	9	+ \| joaosilva \| Joao Silva \|
	10	+ And the following communities
	11	+ \| identifier \| name \|
	12	+ \| sample-community \| Sample Community \|
	13	+ And "Joao Silva" is admin of "Sample Community"
	14	+
	15	+ Scenario: highlight an article before approval of a suggested article
	16	+ Given someone suggested the following article to be published
	17	+ \| target \| article_name \| article_body \| name \| email \|
	18	+ \| sample-community \| A suggested article \| this is an article about whales \| jose \| jose@example.org \|
	19	+ When I am logged in as "joaosilva"
	20	+ And I go to Sample Community's control panel
	21	+ And I follow "Process requests"
	22	+ And I should see "suggested the publication of the article"
	23	+ Then I should see "Highlight this article" within ".task_box"
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '0.28.2'	3	+ VERSION = '0.28.3'
4		4
5	def self.pattern_for_controllers_in_directory(dir)	5	def self.pattern_for_controllers_in_directory(dir)
6	disjunction = controllers_in_directory(dir).join('\|')	6	disjunction = controllers_in_directory(dir).join('\|')
	@@ -13,7 +13,7 @@ msgid ""		@@ -13,7 +13,7 @@ msgid ""
13	msgstr ""	13	msgstr ""
14	"Project-Id-Version: noosfero 0.28.0\n"	14	"Project-Id-Version: noosfero 0.28.0\n"
15	"POT-Creation-Date: 2011-02-02 21:38-0300\n"	15	"POT-Creation-Date: 2011-02-02 21:38-0300\n"
16	-"PO-Revision-Date: 2011-02-02 21:39-0300\n"	16	+"PO-Revision-Date: 2011-02-10 14:54-0300\n"
17	"Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"	17	"Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18	"Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"	18	"Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
19	"MIME-Version: 1.0\n"	19	"MIME-Version: 1.0\n"
	@@ -1660,7 +1660,7 @@ msgstr "O conteúdo aqui está disponível apenas para os amigos do(a) %s."		@@ -1660,7 +1660,7 @@ msgstr "O conteúdo aqui está disponível apenas para os amigos do(a) %s."
1660	#: app/controllers/public/profile_controller.rb:246	1660	#: app/controllers/public/profile_controller.rb:246
1661	msgid "The contents in this community is available to members only."	1661	msgid "The contents in this community is available to members only."
1662	msgstr ""	1662	msgstr ""
1663	-"O conteúdo desta comuninidade está disponível apenas para os seus membros."	1663	+"O conteúdo desta comunidade está disponível apenas para os seus membros."
1664		1664
1665	#: app/controllers/public/profile_controller.rb:252	1665	#: app/controllers/public/profile_controller.rb:252
1666	msgid ""	1666	msgid ""