Merge branch 'AI2852'

Daniela Feitosa
2 parents abdeef43 a96ba9e6
Showing 15 changed files with 224 additions and 79 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/blog_helper.rb
app/helpers/cms_helper.rb
app/helpers/folder_helper.rb
app/helpers/token_helper.rb
app/models/article.rb
app/models/person.rb
app/views/cms/edit.rhtml
db/migrate/20140108132730_article_privacy_exceptions.rb
db/schema.rb
features/edit_article.feature
features/step_definitions/content_steps.rb
public/javascripts/article.js
@@ -2,6 +2,8 @@ class CmsController &lt; MyProfileController
   protect 'edit_profile', :profile, :only => [:set_home_page]
+  include ArticleHelper
+
   def self.protect_if(*args)
     before_filter(*args) do |c|
       user, profile = c.send(:user), c.send(:profile)
@@ -70,6 +72,13 @@ class CmsController &lt; MyProfileController
     translations if @article.translatable?
     continue = params[:continue]
+    @article.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i} unless params[:q].nil?
+
+    @tokenized_children = prepare_to_token_input(
+                            profile.members.includes(:articles_with_access).find_all{ |m|
+                              m.articles_with_access.include?(@article)
+                            }
+                          )
     refuse_blocks
     record_coming
     if request.post?
@@ -130,6 +139,8 @@ class CmsController &lt; MyProfileController
     continue = params[:continue]
     if request.post?
+      @article.article_privacy_exceptions = params[:q].split(/,/).map{|n| environment.people.find n.to_i} unless params[:q].nil?
+
       if @article.save
         if continue
           redirect_to :action => 'edit', :id => @article
@@ -290,6 +301,12 @@ class CmsController &lt; MyProfileController
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
+  def search_article_privacy_exceptions
+    arg = params[:q].downcase
+    result = profile.members.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input(result).to_json
+  end
+
   def media_upload
     files_uploaded = []
     parent = check_parent(params[:parent_id])
@@ -40,6 +40,8 @@ module ApplicationHelper
   include Noosfero::Gravatar
+  include TokenHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -1300,10 +1302,6 @@ module ApplicationHelper
     content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
   end
-  def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
-    "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
-  end
-
   def delete_article_message(article)
     if article.folder?
       _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
@@ -1344,50 +1342,6 @@ module ApplicationHelper
     )
   end
-  def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
-    options[:min_chars] ||= 3
-    options[:hint_text] ||= _("Type in a search term")
-    options[:no_results_text] ||= _("No results")
-    options[:searching_text] ||= _("Searching...")
-    options[:search_delay] ||= 1000
-    options[:prevent_duplicates] ||=  true
-    options[:backspace_delete_item] ||= false
-    options[:focus] ||= false
-    options[:avoid_enter] ||= true
-    options[:on_result] ||= 'null'
-    options[:on_add] ||= 'null'
-    options[:on_delete] ||= 'null'
-    options[:on_ready] ||= 'null'
-
-    result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
-    result += javascript_tag("jQuery('##{element_id}')
-      .tokenInput('#{url_for(search_action)}', {
-        minChars: #{options[:min_chars].to_json},
-        prePopulate: #{options[:pre_populate].to_json},
-        hintText: #{options[:hint_text].to_json},
-        noResultsText: #{options[:no_results_text].to_json},
-        searchingText: #{options[:searching_text].to_json},
-        searchDelay: #{options[:serach_delay].to_json},
-        preventDuplicates: #{options[:prevent_duplicates].to_json},
-        backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
-        queryParam: #{name.to_json},
-        tokenLimit: #{options[:token_limit].to_json},
-        onResult: #{options[:on_result]},
-        onAdd: #{options[:on_add]},
-        onDelete: #{options[:on_delete]},
-        onReady: #{options[:on_ready]},
-      });
-    ")
-    result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
-    if options[:avoid_enter]
-      result += javascript_tag("jQuery('#token-input-#{element_id}')
-                    .live('keydown', function(event){
-                    if(event.keyCode == '13') return false;
-                    });")
-    end
-    result
-  end
-
   def expirable_content_reference(content, action, text, url, options = {})
     reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
     options[:title] = reason
 module ArticleHelper
-  def custom_options_for_article(article)
+  include TokenHelper
+
+  def custom_options_for_article(article, tokenized_children)
     @article = article
-    content_tag('h4', _('Visibility')) +
-    content_tag('div',
-      content_tag('div',
-        radio_button(:article, :published, true) +
-          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
-           ) +
-      content_tag('div',
-        radio_button(:article, :published, false) +
-          content_tag('label', _('Private'), :for => 'article_published_false')
-       )
-     ) +
+
+    visibility_options(@article, tokenized_children) +
     content_tag('h4', _('Options')) +
     content_tag('div',
       (article.profile.has_members? ?
@@ -53,6 +46,28 @@ module ArticleHelper
     )
   end
+  def visibility_options(article, tokenized_children)
+    content_tag('h4', _('Visibility')) +
+    content_tag('div',
+      content_tag('div',
+        radio_button(:article, :published, true) +
+          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
+           ) +
+      content_tag('div',
+        radio_button(:article, :published, false) +
+          content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private")
+       ) +
+      (article.profile.community? ? content_tag('div',
+        content_tag('label', _('Fill in the search field to add the exception users to see this content'), :id => "text-input-search-exception-users") +
+        token_input_field_tag(:q, 'search-article-privacy-exceptions', {:action => 'search_article_privacy_exceptions'},
+          {:focus => false, :hint_text => _('Type in a search term for a user'), :pre_populate => tokenized_children})) :
+          ''))
+  end
+
+  def prepare_to_token_input(array)
+    array.map { |object| {:id => object.id, :name => object.name} }
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
 module BlogHelper
-  def custom_options_for_article(article)
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
     @article = article
     hidden_field_tag('article[published]', 1) +
-    hidden_field_tag('article[accept_comments]', 0)
+    hidden_field_tag('article[accept_comments]', 0) +
+    visibility_options(article,tokenized_children)
   end
   def cms_label_for_new_children
@@ -22,9 +22,9 @@ module CmsHelper
   attr_reader :environment
-  def options_for_article(article)
+  def options_for_article(article, tokenized_children=nil)
     article_helper = helper_for_article(article)
-    article_helper.custom_options_for_article(article)
+    article_helper.custom_options_for_article(article, tokenized_children)
   end
   def link_to_article(article)
 module FolderHelper
   include ShortFilename
+  include ArticleHelper
   def list_articles(articles, recursive = false)
     if !articles.blank?
@@ -60,19 +61,10 @@ module FolderHelper
     "icon-new icon-new%s" % klass.icon_name
   end
-  def custom_options_for_article(article)
+  def custom_options_for_article(article,tokenized_children)
     @article = article
-    content_tag('h4', _('Visibility')) +
-    content_tag('div',
-      content_tag('div',
-        radio_button(:article, :published, true) +
-          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
-           ) +
-      content_tag('div',
-        radio_button(:article, :published, false) +
-          content_tag('label', _('Private'), :for => 'article_published_false')
-       )
-     ) +
+
+    visibility_options(article,tokenized_children) +
     content_tag('div',
       hidden_field_tag('article[accept_comments]', 0)
     )
@@ -0,0 +1,51 @@
+module TokenHelper
+
+  def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
+    "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
+  end
+
+  def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
+    options[:min_chars] ||= 3
+    options[:hint_text] ||= _("Type in a search term")
+    options[:no_results_text] ||= _("No results")
+    options[:searching_text] ||= _("Searching...")
+    options[:search_delay] ||= 1000
+    options[:prevent_duplicates] ||=  true
+    options[:backspace_delete_item] ||= false
+    options[:focus] ||= false
+    options[:avoid_enter] ||= true
+    options[:on_result] ||= 'null'
+    options[:on_add] ||= 'null'
+    options[:on_delete] ||= 'null'
+    options[:on_ready] ||= 'null'
+
+    result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
+    result += javascript_tag("jQuery('##{element_id}')
+      .tokenInput('#{url_for(search_action)}', {
+        minChars: #{options[:min_chars].to_json},
+        prePopulate: #{options[:pre_populate].to_json},
+        hintText: #{options[:hint_text].to_json},
+        noResultsText: #{options[:no_results_text].to_json},
+        searchingText: #{options[:searching_text].to_json},
+        searchDelay: #{options[:serach_delay].to_json},
+        preventDuplicates: #{options[:prevent_duplicates].to_json},
+        backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
+        queryParam: #{name.to_json},
+        tokenLimit: #{options[:token_limit].to_json},
+        onResult: #{options[:on_result]},
+        onAdd: #{options[:on_add]},
+        onDelete: #{options[:on_delete]},
+        onReady: #{options[:on_ready]},
+      });
+    ")
+    result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
+    if options[:avoid_enter]
+      result += javascript_tag("jQuery('#token-input-#{element_id}')
+                    .live('keydown', function(event){
+                    if(event.keyCode == '13') return false;
+                    });")
+    end
+    result
+  end
+
+end
 \ No newline at end of file
@@ -69,6 +69,7 @@ class Article &lt; ActiveRecord::Base
   settings_items :allow_members_to_edit, :type => :boolean, :default => false
   settings_items :moderate_comments, :type => :boolean, :default => false
   settings_items :followers, :type => Array, :default => []
+  has_and_belongs_to_many :article_privacy_exceptions, :class_name => 'Person', :join_table => 'article_privacy_exceptions'
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
@@ -470,7 +471,8 @@ class Article &lt; ActiveRecord::Base
   def display_unpublished_article_to?(user)
     user == author || allow_view_private_content?(user) || user == profile ||
-    user.is_admin?(profile.environment) || user.is_admin?(profile)
+    user.is_admin?(profile.environment) || user.is_admin?(profile) ||
+    article_privacy_exceptions.include?(user)
   end
   def display_to?(user = nil)
@@ -64,6 +64,7 @@ class Person &lt; Profile
   has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
+  has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
   named_scope :more_popular,
       :select => "#{Profile.qualified_column_names}, count(friend_id) as total",
 <%= error_messages_for 'article' %>
+<%= javascript_include_tag "article.js" %>
 <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
 <% labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
@@ -33,7 +34,7 @@
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
   <div id='edit-article-options'>
-    <%= options_for_article(@article) %>
+    <%= options_for_article(@article, @tokenized_children) %>
   </div>
   <% button_bar do %>
@@ -0,0 +1,12 @@
+class ArticlePrivacyExceptions < ActiveRecord::Migration
+  def self.up
+    create_table :article_privacy_exceptions, :id => false do |t|
+      t.integer :article_id
+      t.integer :person_id
+    end
+  end
+
+  def self.down
+    drop_table :article_privacy_exceptions
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20131128161159) do
+ActiveRecord::Schema.define(:version => 20140108132730) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -46,6 +46,11 @@ ActiveRecord::Schema.define(:version =&gt; 20131128161159) do
   add_index "action_tracker_notifications", ["profile_id", "action_tracker_id"], :name => "index_action_tracker_notif_on_prof_id_act_tracker_id", :unique => true
   add_index "action_tracker_notifications", ["profile_id"], :name => "index_action_tracker_notifications_on_profile_id"
+  create_table "article_privacy_exceptions", :id => false, :force => true do |t|
+    t.integer "article_id"
+    t.integer "person_id"
+  end
+
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
     t.integer  "version"
@@ -22,6 +22,70 @@ Feature: edit article
     And I go to joaosilva's control panel
     Then I should see "My Folder"
+  @selenium
+  Scenario: denied access folder for a not logged user
+    Given the following communities
+      | name           | identifier    | owner     |
+      | Free Software  | freesoftware  | joaosilva |
+    And the following users
+      | login | name        |
+      | mario | Mario Souto |
+      | maria | Maria Silva |
+    And "Mario Souto" is a member of "Free Software"
+    And "Maria Silva" is a member of "Free Software"
+    And I am on freesoftware's control panel
+    And I follow "Manage Content"
+    And I follow "New content"
+    When I follow "Folder"
+    And I fill in "Title" with "My Folder"
+    And I choose "article_published_false"
+    And I press "Save"
+    And I log off
+    And I go to /freesoftware/my-folder
+    Then I should see "Access denied"
+
+  @selenium
+  Scenario: show exception users field when you choose the private option
+    Given the following communities
+      | name           | identifier    | owner     |
+      | Free Software  | freesoftware  | joaosilva |
+    And the following users
+      | login | name        |
+      | mario | Mario Souto |
+      | maria | Maria Silva |
+    And "Mario Souto" is a member of "Free Software"
+    And "Maria Silva" is a member of "Free Software"
+    And I am on freesoftware's control panel
+    And I follow "Manage Content"
+    And I follow "New content"
+    When I follow "Folder"
+    And I fill in "Title" with "My Folder"
+    And I choose "article_published_false"
+    Then I should see "Fill in the search field to add the exception users to see this content"
+
+  @selenium
+  Scenario: allowed user should see the content of a folder
+    Given the following communities
+      | name           | identifier    | owner     |
+      | Free Software  | freesoftware  | joaosilva |
+    And the following users
+      | login | name        |
+      | mario | Mario Souto |
+      | maria | Maria Silva |
+    And the following articles
+      | owner        | name       | body |
+      | freesoftware | My Folder  | ...  |
+    And "Mario Souto" is a member of "Free Software"
+    And "Maria Silva" is a member of "Free Software"
+    And I go to /freesoftware/my-folder
+    When I follow "Edit"
+    And I choose "article_published_false"
+    And I press "Save"
+    And I add to "My Folder" the following exception "Maria Silva"
+    And I am logged in as "maria"
+    And I go to /freesoftware/my-folder
+    Then I should see "My Folder"
+
   Scenario: redirect to the created folder
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
@@ -40,6 +104,7 @@ Feature: edit article
     When I follow "Cancel" within ".main-block"
     Then I should be on joaosilva's cms
+  @selenium
   Scenario: display tag list field when creating event
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
@@ -8,3 +8,15 @@ When /^I create a content of type &quot;([^\&quot;]*)&quot; with the following data$/ do |conte
   click_button "Save"
 end
+
+And /^I add to "([^\"]*)" the following exception "([^\"]*)"$/ do |article_name, user_exception|
+  article = Article.find_by_name(article_name)
+  community = article.profile
+  raise "The article profile is not a community." unless community.class == Community
+
+  my_user = community.members.find_by_name(user_exception)
+  raise "Could not find #{user_exception} in #{community.name} community." if my_user.nil?
+
+  article.article_privacy_exceptions << my_user
+  article.save
+end
 \ No newline at end of file
@@ -172,4 +172,19 @@ jQuery(function($) {
     return false;
   });
+  function show_hide_token_input() {
+    if($("#article_published_false").attr('checked'))
+      $("#text-input-search-exception-users").parent("div").css('display', 'block');
+    else
+      $("#text-input-search-exception-users").parent("div").css('display', 'none');
+  }
+
+  if( $("#token-input-search-article-privacy-exceptions").length == 1 ) {
+    show_hide_token_input();
+
+    //Hide / Show the text area
+    $("#article_published_false").click(show_hide_token_input);
+    $("#article_published_true").click(show_hide_token_input);
+  }
+
 });
	@@ -40,6 +40,8 @@ module ApplicationHelper		@@ -40,6 +40,8 @@ module ApplicationHelper
40		40
41	include Noosfero::Gravatar	41	include Noosfero::Gravatar
42		42
		43	+ include TokenHelper
		44	+
43	def locale	45	def locale
44	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale	46	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
45	end	47	end
	@@ -1300,10 +1302,6 @@ module ApplicationHelper		@@ -1300,10 +1302,6 @@ module ApplicationHelper
1300	content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')	1302	content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
1301	end	1303	end
1302		1304
1303	- def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
1304	- "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
1305	- end
1306	-
1307	def delete_article_message(article)	1305	def delete_article_message(article)
1308	if article.folder?	1306	if article.folder?
1309	_("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")	1307	_("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
	@@ -1344,50 +1342,6 @@ module ApplicationHelper		@@ -1344,50 +1342,6 @@ module ApplicationHelper
1344	)	1342	)
1345	end	1343	end
1346		1344
1347	- def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
1348	- options[:min_chars] \|\|= 3
1349	- options[:hint_text] \|\|= _("Type in a search term")
1350	- options[:no_results_text] \|\|= _("No results")
1351	- options[:searching_text] \|\|= _("Searching...")
1352	- options[:search_delay] \|\|= 1000
1353	- options[:prevent_duplicates] \|\|= true
1354	- options[:backspace_delete_item] \|\|= false
1355	- options[:focus] \|\|= false
1356	- options[:avoid_enter] \|\|= true
1357	- options[:on_result] \|\|= 'null'
1358	- options[:on_add] \|\|= 'null'
1359	- options[:on_delete] \|\|= 'null'
1360	- options[:on_ready] \|\|= 'null'
1361	-
1362	- result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
1363	- result += javascript_tag("jQuery('##{element_id}')
1364	- .tokenInput('#{url_for(search_action)}', {
1365	- minChars: #{options[:min_chars].to_json},
1366	- prePopulate: #{options[:pre_populate].to_json},
1367	- hintText: #{options[:hint_text].to_json},
1368	- noResultsText: #{options[:no_results_text].to_json},
1369	- searchingText: #{options[:searching_text].to_json},
1370	- searchDelay: #{options[:serach_delay].to_json},
1371	- preventDuplicates: #{options[:prevent_duplicates].to_json},
1372	- backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
1373	- queryParam: #{name.to_json},
1374	- tokenLimit: #{options[:token_limit].to_json},
1375	- onResult: #{options[:on_result]},
1376	- onAdd: #{options[:on_add]},
1377	- onDelete: #{options[:on_delete]},
1378	- onReady: #{options[:on_ready]},
1379	- });
1380	- ")
1381	- result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
1382	- if options[:avoid_enter]
1383	- result += javascript_tag("jQuery('#token-input-#{element_id}')
1384	- .live('keydown', function(event){
1385	- if(event.keyCode == '13') return false;
1386	- });")
1387	- end
1388	- result
1389	- end
1390	-
1391	def expirable_content_reference(content, action, text, url, options = {})	1345	def expirable_content_reference(content, action, text, url, options = {})
1392	reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first	1346	reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
1393	options[:title] = reason	1347	options[:title] = reason
1	module ArticleHelper	1	module ArticleHelper
2		2
3	- def custom_options_for_article(article)	3	+ include TokenHelper
		4	+
		5	+ def custom_options_for_article(article, tokenized_children)
4	@article = article	6	@article = article
5	- content_tag('h4', _('Visibility')) +
6	- content_tag('div',
7	- content_tag('div',
8	- radio_button(:article, :published, true) +
9	- content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
10	- ) +
11	- content_tag('div',
12	- radio_button(:article, :published, false) +
13	- content_tag('label', _('Private'), :for => 'article_published_false')
14	- )
15	- ) +	7	+
		8	+ visibility_options(@article, tokenized_children) +
16	content_tag('h4', _('Options')) +	9	content_tag('h4', _('Options')) +
17	content_tag('div',	10	content_tag('div',
18	(article.profile.has_members? ?	11	(article.profile.has_members? ?
	@@ -53,6 +46,28 @@ module ArticleHelper		@@ -53,6 +46,28 @@ module ArticleHelper
53	)	46	)
54	end	47	end
55		48
		49	+ def visibility_options(article, tokenized_children)
		50	+ content_tag('h4', _('Visibility')) +
		51	+ content_tag('div',
		52	+ content_tag('div',
		53	+ radio_button(:article, :published, true) +
		54	+ content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
		55	+ ) +
		56	+ content_tag('div',
		57	+ radio_button(:article, :published, false) +
		58	+ content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private")
		59	+ ) +
		60	+ (article.profile.community? ? content_tag('div',
		61	+ content_tag('label', _('Fill in the search field to add the exception users to see this content'), :id => "text-input-search-exception-users") +
		62	+ token_input_field_tag(:q, 'search-article-privacy-exceptions', {:action => 'search_article_privacy_exceptions'},
		63	+ {:focus => false, :hint_text => _('Type in a search term for a user'), :pre_populate => tokenized_children})) :
		64	+ ''))
		65	+ end
		66	+
		67	+ def prepare_to_token_input(array)
		68	+ array.map { \|object\| {:id => object.id, :name => object.name} }
		69	+ end
		70	+
56	def cms_label_for_new_children	71	def cms_label_for_new_children
57	_('New article')	72	_('New article')
58	end	73	end
	@@ -22,9 +22,9 @@ module CmsHelper		@@ -22,9 +22,9 @@ module CmsHelper
22		22
23	attr_reader :environment	23	attr_reader :environment
24		24
25	- def options_for_article(article)	25	+ def options_for_article(article, tokenized_children=nil)
26	article_helper = helper_for_article(article)	26	article_helper = helper_for_article(article)
27	- article_helper.custom_options_for_article(article)	27	+ article_helper.custom_options_for_article(article, tokenized_children)
28	end	28	end
29		29
30	def link_to_article(article)	30	def link_to_article(article)
	@@ -0,0 +1,51 @@		@@ -0,0 +1,51 @@
		1	+module TokenHelper
		2	+
		3	+ def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
		4	+ "hintText: '#{hintText}', noResultsText: '#{noResultsText}', searchingText: '#{searchingText}'"
		5	+ end
		6	+
		7	+ def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
		8	+ options[:min_chars] \|\|= 3
		9	+ options[:hint_text] \|\|= _("Type in a search term")
		10	+ options[:no_results_text] \|\|= _("No results")
		11	+ options[:searching_text] \|\|= _("Searching...")
		12	+ options[:search_delay] \|\|= 1000
		13	+ options[:prevent_duplicates] \|\|= true
		14	+ options[:backspace_delete_item] \|\|= false
		15	+ options[:focus] \|\|= false
		16	+ options[:avoid_enter] \|\|= true
		17	+ options[:on_result] \|\|= 'null'
		18	+ options[:on_add] \|\|= 'null'
		19	+ options[:on_delete] \|\|= 'null'
		20	+ options[:on_ready] \|\|= 'null'
		21	+
		22	+ result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
		23	+ result += javascript_tag("jQuery('##{element_id}')
		24	+ .tokenInput('#{url_for(search_action)}', {
		25	+ minChars: #{options[:min_chars].to_json},
		26	+ prePopulate: #{options[:pre_populate].to_json},
		27	+ hintText: #{options[:hint_text].to_json},
		28	+ noResultsText: #{options[:no_results_text].to_json},
		29	+ searchingText: #{options[:searching_text].to_json},
		30	+ searchDelay: #{options[:serach_delay].to_json},
		31	+ preventDuplicates: #{options[:prevent_duplicates].to_json},
		32	+ backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
		33	+ queryParam: #{name.to_json},
		34	+ tokenLimit: #{options[:token_limit].to_json},
		35	+ onResult: #{options[:on_result]},
		36	+ onAdd: #{options[:on_add]},
		37	+ onDelete: #{options[:on_delete]},
		38	+ onReady: #{options[:on_ready]},
		39	+ });
		40	+ ")
		41	+ result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
		42	+ if options[:avoid_enter]
		43	+ result += javascript_tag("jQuery('#token-input-#{element_id}')
		44	+ .live('keydown', function(event){
		45	+ if(event.keyCode == '13') return false;
		46	+ });")
		47	+ end
		48	+ result
		49	+ end
		50	+
		51	+end
0	\ No newline at end of file	52	\ No newline at end of file
	@@ -64,6 +64,7 @@ class Person < Profile		@@ -64,6 +64,7 @@ class Person < Profile
64	has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy	64	has_many :scraps_sent, :class_name => 'Scrap', :foreign_key => :sender_id, :dependent => :destroy
65		65
66	has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'	66	has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
		67	+ has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
67		68
68	named_scope :more_popular,	69	named_scope :more_popular,
69	:select => "#{Profile.qualified_column_names}, count(friend_id) as total",	70	:select => "#{Profile.qualified_column_names}, count(friend_id) as total",
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class ArticlePrivacyExceptions < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :article_privacy_exceptions, :id => false do \|t\|
	4	+ t.integer :article_id
	5	+ t.integer :person_id
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :article_privacy_exceptions
	11	+ end
	12	+end
	@@ -22,6 +22,70 @@ Feature: edit article		@@ -22,6 +22,70 @@ Feature: edit article
22	And I go to joaosilva's control panel	22	And I go to joaosilva's control panel
23	Then I should see "My Folder"	23	Then I should see "My Folder"
24		24
		25	+ @selenium
		26	+ Scenario: denied access folder for a not logged user
		27	+ Given the following communities
		28	+ \| name \| identifier \| owner \|
		29	+ \| Free Software \| freesoftware \| joaosilva \|
		30	+ And the following users
		31	+ \| login \| name \|
		32	+ \| mario \| Mario Souto \|
		33	+ \| maria \| Maria Silva \|
		34	+ And "Mario Souto" is a member of "Free Software"
		35	+ And "Maria Silva" is a member of "Free Software"
		36	+ And I am on freesoftware's control panel
		37	+ And I follow "Manage Content"
		38	+ And I follow "New content"
		39	+ When I follow "Folder"
		40	+ And I fill in "Title" with "My Folder"
		41	+ And I choose "article_published_false"
		42	+ And I press "Save"
		43	+ And I log off
		44	+ And I go to /freesoftware/my-folder
		45	+ Then I should see "Access denied"
		46	+
		47	+ @selenium
		48	+ Scenario: show exception users field when you choose the private option
		49	+ Given the following communities
		50	+ \| name \| identifier \| owner \|
		51	+ \| Free Software \| freesoftware \| joaosilva \|
		52	+ And the following users
		53	+ \| login \| name \|
		54	+ \| mario \| Mario Souto \|
		55	+ \| maria \| Maria Silva \|
		56	+ And "Mario Souto" is a member of "Free Software"
		57	+ And "Maria Silva" is a member of "Free Software"
		58	+ And I am on freesoftware's control panel
		59	+ And I follow "Manage Content"
		60	+ And I follow "New content"
		61	+ When I follow "Folder"
		62	+ And I fill in "Title" with "My Folder"
		63	+ And I choose "article_published_false"
		64	+ Then I should see "Fill in the search field to add the exception users to see this content"
		65	+
		66	+ @selenium
		67	+ Scenario: allowed user should see the content of a folder
		68	+ Given the following communities
		69	+ \| name \| identifier \| owner \|
		70	+ \| Free Software \| freesoftware \| joaosilva \|
		71	+ And the following users
		72	+ \| login \| name \|
		73	+ \| mario \| Mario Souto \|
		74	+ \| maria \| Maria Silva \|
		75	+ And the following articles
		76	+ \| owner \| name \| body \|
		77	+ \| freesoftware \| My Folder \| ... \|
		78	+ And "Mario Souto" is a member of "Free Software"
		79	+ And "Maria Silva" is a member of "Free Software"
		80	+ And I go to /freesoftware/my-folder
		81	+ When I follow "Edit"
		82	+ And I choose "article_published_false"
		83	+ And I press "Save"
		84	+ And I add to "My Folder" the following exception "Maria Silva"
		85	+ And I am logged in as "maria"
		86	+ And I go to /freesoftware/my-folder
		87	+ Then I should see "My Folder"
		88	+
25	Scenario: redirect to the created folder	89	Scenario: redirect to the created folder
26	Given I am on joaosilva's control panel	90	Given I am on joaosilva's control panel
27	And I follow "Manage Content"	91	And I follow "Manage Content"
	@@ -40,6 +104,7 @@ Feature: edit article		@@ -40,6 +104,7 @@ Feature: edit article
40	When I follow "Cancel" within ".main-block"	104	When I follow "Cancel" within ".main-block"
41	Then I should be on joaosilva's cms	105	Then I should be on joaosilva's cms
42		106
		107	+ @selenium
43	Scenario: display tag list field when creating event	108	Scenario: display tag list field when creating event
44	Given I am on joaosilva's control panel	109	Given I am on joaosilva's control panel
45	And I follow "Manage Content"	110	And I follow "Manage Content"
	@@ -8,3 +8,15 @@ When /^I create a content of type "([^\"]*)" with the following data$/ do \|conte		@@ -8,3 +8,15 @@ When /^I create a content of type "([^\"]*)" with the following data$/ do \|conte
8		8
9	click_button "Save"	9	click_button "Save"
10	end	10	end
		11	+
		12	+And /^I add to "([^\"])" the following exception "([^\"])"$/ do \|article_name, user_exception\|
		13	+ article = Article.find_by_name(article_name)
		14	+ community = article.profile
		15	+ raise "The article profile is not a community." unless community.class == Community
		16	+
		17	+ my_user = community.members.find_by_name(user_exception)
		18	+ raise "Could not find #{user_exception} in #{community.name} community." if my_user.nil?
		19	+
		20	+ article.article_privacy_exceptions << my_user
		21	+ article.save
		22	+end
11	\ No newline at end of file	23	\ No newline at end of file
	@@ -172,4 +172,19 @@ jQuery(function($) {		@@ -172,4 +172,19 @@ jQuery(function($) {
172	return false;	172	return false;
173	});	173	});
174		174
		175	+ function show_hide_token_input() {
		176	+ if($("#article_published_false").attr('checked'))
		177	+ $("#text-input-search-exception-users").parent("div").css('display', 'block');
		178	+ else
		179	+ $("#text-input-search-exception-users").parent("div").css('display', 'none');
		180	+ }
		181	+
		182	+ if( $("#token-input-search-article-privacy-exceptions").length == 1 ) {
		183	+ show_hide_token_input();
		184	+
		185	+ //Hide / Show the text area
		186	+ $("#article_published_false").click(show_hide_token_input);
		187	+ $("#article_published_true").click(show_hide_token_input);
		188	+ }
		189	+
175	});	190	});