fix conflit with task_taggable branch

Leandro Santos
2 parents d555951e f5aeac9a
Showing 7 changed files with 368 additions and 99 deletions Show diff stats
app/controllers/my_profile/tasks_controller.rb
app/models/person.rb
app/views/tasks/_task.html.erb
app/views/tasks/index.html.erb
public/javascripts/inputosaurus.js
test/functional/tasks_controller_test.rb
test/unit/task_test.rb
 class TasksController < MyProfileController
-  protect [:perform_task, :view_tasks], :profile, :only => [:index]
-  protect :perform_task, :profile, :except => [:index]
+  protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags]
+  protect :perform_task, :profile, :except => [:index, :save_tags, :search_tags]
   def index
     @filter_type = params[:filter_type].presence
     @filter_text = params[:filter_text].presence
     @filter_responsible = params[:filter_responsible]
+    @filter_tags = params[:filter_tags]
+
     @task_types = Task.pending_types_for(profile)
+    @task_tags = [OpenStruct.new(:name => _('All'), :id => nil) ] + Task.all_tags
     @tasks = Task.pending_all(profile, @filter_type, @filter_text).order_by('created_at', 'asc')
     @tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?
+    @tasks = @tasks.tagged_with(@filter_tags, any: true) if @filter_tags.present?
     @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
@@ -112,4 +116,36 @@ class TasksController &lt; MyProfileController
     render :json => result.map { |task| {:label => task.data[:name], :value => task.data[:name]} }
   end
+  def save_tags
+
+    if request.post? && params[:tag_list]
+      result = {
+        success: false,
+        message: _('Error to save tags. Please, contact the system admin')
+      }
+
+      ActsAsTaggableOn.remove_unused_tags = true
+
+      task = profile.tasks.find_by_id params[:task_id]
+      save = user.tag(task, with: params[:tag_list], on: :tags)
+
+      if save
+        result[:success] = true
+      end
+    end
+
+    render json: result
+  end
+
+  #FIXME make this test
+  # Should not search for article tasks
+  # Should not search for other profile tags
+  # Should search only task tags
+  # Should check the permissions
+  def search_tags
+    arg = params[:term].downcase
+    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
+  end
+
 end
@@ -16,6 +16,8 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
+  acts_as_tagger
+
   scope :members_of, lambda { |resources|
     resources = [resources] if !resources.kind_of?(Array)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
@@ -64,7 +64,7 @@
     <div class="formfieldline">
       <div class="formfield tag-list-fields">
-        <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", task.tag_list.to_s, :size => 36, :class => 'tag-list') %>
+        <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", task.tags_from(nil).to_s, :size => 36, :class => 'tag-list','data-submit-values'=>"{'task_id':'#{task.id}'}") %>
       </div>
     </div>
@@ -35,6 +35,11 @@
       </p>
     <% end %>
     <p>
+      <%= labelled_select(_('Tags')+': ', :filter_tags, :id, :name, @filter_tags, @task_tags, {:id => 'filter-add-tag'}) %>
+      <%= text_field_tag( :filter_tags, @filter_tags, :size => 36, :class => 'filter-tags' ) %>
+    </p>
+
+    <p>
       <%= submit_button(:search, _('Search')) %>
     </p>
   <% end %>
@@ -94,3 +99,55 @@
 <%= javascript_include_tag 'tasks' %>
+
+<script type="text/javascript">
+
+  jQuery('.filter-tags').inputosaurus({
+    hideInput: true
+  });
+
+  $('#filter-add-tag').change(function(){
+
+    if($(this).val() != ''){
+      jQuery('.filter-tags').inputosaurus('addTags',$(this).children(':selected').text());
+    }
+  });
+
+  jQuery('.tag-list').inputosaurus({
+    autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/tasks/search_tags'," %>
+    activateFinalResult: true,
+    submitTags: {
+      url: <%= "'/myprofile/#{profile.identifier}/tasks/save_tags'" %>,
+      beforeSend: function(){
+        this.element.parents('.task_box')
+                    .prev('.fg-state-error')
+                    .remove();
+      },
+      success: function(response){
+
+        this.element.parents('.task_box')
+                    .prev('.fg-state-error')
+                    .remove();
+
+        if(!response.success){
+
+          var errorIcon = $('<span/>',{
+            'class':'ui-icon ui-icon-alert',
+            style:'float: left; margin-right: .3em;'
+          });
+
+          var content = $('<p/>',{
+            html:'<strong>'+response.message+'</strong>'
+          }).prepend(errorIcon);
+
+          var div = $('<div/>',{
+              'class':'alert fg-state-error ui-state-error'
+          }).append(content);
+
+          this.element.parents('.task_box').before(div);
+        }
+
+      }
+    }
+  })
+</script>
 /**
- * Inputosaurus Text 
+ * Inputosaurus Text
  *
  * Must be instantiated on an <input> element
  * Allows multiple input items. Each item is represented with a removable tag that appears to be inside the input area.
@@ -30,7 +30,7 @@
 			//
 			// 'change' - triggered whenever a tag is added or removed (should be similar to binding the the change event of the instantiated input
 			// 'keyup' - keyup event on the newly created input
-			
+
 			// while typing, the user can separate values using these delimiters
 			// the value tags are created on the fly when an inputDelimiter is detected
 			inputDelimiters : [',', ';'],
@@ -56,12 +56,18 @@
 			// manipulate and return the input value after parseInput() parsing
 			// the array of tag names is passed and expected to be returned as an array after manipulation
 			parseHook : null,
-			
+
 			// define a placeholder to display when the input is empty
 			placeholder: null,
-			
+
 			// when you check for duplicates it check for the case
-			caseSensitiveDuplicates: false
+			caseSensitiveDuplicates: false,
+
+			//Hide input to inform tags. This is cool when you create tags from another way
+			hideInput: false,
+
+			//Ajax options to send tags
+			submitTags: null
 		},
 		_create: function() {
@@ -69,7 +75,7 @@
 				els = {},
 				o = widget.options,
 				placeholder =  o.placeholder || this.element.attr('placeholder') || null;
-				
+
 			this._chosenValues = [];
 			// Create the elements
@@ -77,11 +83,11 @@
 			els.input = $('<input type="text" />');
 			els.inputCont = $('<li class="inputosaurus-input inputosaurus-required"></li>');
 			els.origInputCont = $('<li class="inputosaurus-input-hidden inputosaurus-required">');
-			
+
 			// define starting placeholder
-			if (placeholder) { 
+			if (placeholder) {
 				o.placeholder = placeholder;
-				els.input.attr('placeholder', o.placeholder); 
+				els.input.attr('placeholder', o.placeholder);
 				if (o.width) {
 					els.input.css('min-width', o.width - 50);
 				}
@@ -90,11 +96,11 @@
 			o.wrapperElement && o.wrapperElement.append(els.ul);
 			this.element.replaceWith(o.wrapperElement || els.ul);
 			els.origInputCont.append(this.element).hide();
-			
+
 			els.inputCont.append(els.input);
 			els.ul.append(els.inputCont);
 			els.ul.append(els.origInputCont);
-			
+
 			o.width && els.ul.css('width', o.width);
 			this.elements = els;
@@ -130,8 +136,8 @@
 						var auto =  $(this).data('ui-autocomplete') || $(this).data('autocomplete');
 						var menu = auto.menu,
 							$menuItems;
-						
-						
+
+
 						// zIndex will force the element on top of anything (like a dialog it's in)
 						menu.element.zIndex && menu.element.zIndex($(this).zIndex() + 1);
 						menu.element.width(widget.elements.ul.outerWidth());
@@ -201,6 +207,31 @@
 			widget._resetPlaceholder();
 		},
+		addTags: function(list){
+
+			if(arguments.length == 1){
+				list = [list];
+			}
+
+			if(arguments[1]){
+				list = Array.prototype.slice.call(arguments);
+			}
+
+			if(!$.isArray(list)){
+				var msg = 'Tag list needs be an Array';
+
+				if(console){
+					console.error(msg);
+
+					return false;
+				}else{
+					throw new Error(msg);
+				}
+
+			}
+			this._setChosen(list);
+		},
+
 		_inputFocus : function(ev) {
 			var widget = ev.data.widget || this;
@@ -241,7 +272,7 @@
 			widget.elements.input.width(txtWidth < maxWidth ? txtWidth : maxWidth);
 		},
-		
+
 		// resets placeholder on representative input
 		_resetPlaceholder: function () {
 			var placeholder = this.options.placeholder,
@@ -266,7 +297,7 @@
 				ev.preventDefault();
 				lastTag.find('a').focus();
 			}
-			
+
 		},
 		_editTag : function(ev) {
@@ -285,6 +316,7 @@
 				v.key === tagKey && (tagName = v.value);
 			});
+			widget.beforeEditValue = widget.element.val();
 			widget.elements.input.val(tagName);
 			widget._removeTag(ev);
@@ -295,7 +327,7 @@
 			var widget = ev.data.widget;
 			switch(ev.which){
-				case $.ui.keyCode.BACKSPACE: 
+				case $.ui.keyCode.BACKSPACE:
 					ev && ev.preventDefault();
 					ev && ev.stopPropagation();
 					$(ev.currentTarget).trigger('click');
@@ -395,6 +427,10 @@
 				}
 			});
 			self._setValue(self._buildValue());
+
+			if(this.options.hideInput){
+				this.elements.input.parent().hide();
+			}
 		},
 		_buildValue : function() {
@@ -409,11 +445,18 @@
 		},
 		_setValue : function(value) {
-			var val = this.element.val();
+
+			if(arguments[1] && (arguments[1].type == 'dblclick' && value == '')){
+				return false;
+			}
+			var val = this.element.val().replace(/,\s*/g,',');
 			if(val !== value){
 				this.element.val(value);
 				this._trigger('change');
+				if($.isPlainObject(this.options.submitTags)){
+					this._sendTags();
+				}
 			}
 		},
@@ -439,7 +482,7 @@
 		},
 		_removeTag : function(ev) {
-			var $closest = $(ev.currentTarget).closest('li'), 
+			var $closest = $(ev.currentTarget).closest('li'),
 				key = $closest.data('ui-inputosaurus') || $closest.data('inputosaurus'),
 				indexFound = false,
 				widget = (ev && ev.data.widget) || this;
@@ -453,7 +496,7 @@
 			indexFound !== false && widget._chosenValues.splice(indexFound, 1);
-			widget._setValue(widget._buildValue());
+			widget._setValue(widget._buildValue(),ev);
 			$(ev.currentTarget).closest('li').remove();
 			widget.elements.input.focus();
@@ -477,7 +520,7 @@
 			var delim = this.options.outputDelimiter,
 				val = this.element.val(),
 				values = [];
-			
+
 			values.push(val);
 			delim && (values = val.split(delim));
@@ -515,9 +558,38 @@
 			this.elements.ul.replaceWith(this.element);
+		},
+
+		_sendTags: function(){
+
+			var requestTags = this.options.submitTags;
+			if(this.element.val() != '' && this.beforeEditValue != this.element.val()) {
+
+				opts = $.extend({
+					url: requestTags.url,
+					dataType: 'json',
+					data:{},
+					type:'POST',
+					context:this
+				},requestTags);
+
+				var extraValues = this.element.data('submit-values');
+				if(typeof extraValues == 'string' && /\{*/.test(extraValues)){
+					extraValues = $.parseJSON(extraValues.replace(/\'/g,'\"'));
+				}
+
+				if(!$.isEmptyObject(extraValues)){
+					for(v in extraValues){
+						opts.data[v] = extraValues[v];
+					}
+				}
+
+				opts.data.tag_list = this.element.val();
+
+				$.ajax(opts);
+			}
 		}
 	};
 	$.widget("ui.inputosaurus", inputosaurustext);
-})(jQuery);
-
+})($ || jQuery);
@@ -12,14 +12,14 @@ class TasksControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    self.profile = create_user('testuser').person
-    @controller.stubs(:profile).returns(profile)
+    @person = create_user('testuser').person
+    @controller.stubs(:profile).returns(@person)
     login_as 'testuser'
   end
-  attr_accessor :profile
+  attr_accessor :person
   def assert_redirected_to(options)
-    super({ :controller => 'tasks', :profile => profile.identifier }.merge(options))
+    super({ :controller => 'tasks', :profile => person.identifier }.merge(options))
   end
   should 'list pending tasks' do
@@ -63,8 +63,8 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'list pending tasks without spam' do
     requestor = fast_create(Person)
-    task_spam = Task.create!(:requestor => requestor, :target => profile, :spam => true)
-    task_ham = Task.create!(:requestor => requestor, :target => profile, :spam => false)
+    task_spam = Task.create!(:requestor => requestor, :target => person, :spam => true)
+    task_ham = Task.create!(:requestor => requestor, :target => person, :spam => false)
     get :index
     assert_response :success
@@ -81,15 +81,15 @@ class TasksControllerTest &lt; ActionController::TestCase
   end
   should 'display task created_at' do
-    Task.create!(:requestor => fast_create(Person), :target => profile, :spam => false)
+    Task.create!(:requestor => fast_create(Person), :target => person, :spam => false)
     get :index
     assert_select '.task_date'
   end
   should 'list processed tasks without spam' do
     requestor = fast_create(Person)
-    task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true)
-    task_ham = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => false)
+    task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => person, :spam => true)
+    task_ham = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => person, :spam => false)
     get :processed
     assert_response :success
@@ -98,7 +98,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   end
   should 'be able to finish a task' do
-    t = profile.tasks.build; t.save!
+    t = person.tasks.build; t.save!
     post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
     assert_redirected_to :action => 'index'
@@ -108,7 +108,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   end
   should 'be able to cancel a task' do
-    t = profile.tasks.build; t.save!
+    t = person.tasks.build; t.save!
     post :close, :tasks => {t.id => {:decision => 'cancel', :task => {}}}
     assert_redirected_to :action => 'index'
@@ -118,7 +118,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   end
   should 'be able to skip a task' do
-    t = profile.tasks.build; t.save!
+    t = person.tasks.build; t.save!
     post :close, :tasks => {t.id => {:decision => 'skip', :task => {}}}
     assert_redirected_to :action => 'index'
@@ -128,9 +128,9 @@ class TasksControllerTest &lt; ActionController::TestCase
   end
   should 'be able to apply different decisions to multiples tasks at the same time' do
-    t1 = profile.tasks.build; t1.save!
-    t2 = profile.tasks.build; t2.save!
-    t3 = profile.tasks.build; t3.save!
+    t1 = person.tasks.build; t1.save!
+    t2 = person.tasks.build; t2.save!
+    t3 = person.tasks.build; t3.save!
     post :close, :tasks => {t1.id => {:decision => 'finish', :task => {}}, t2.id => {:decision => 'cancel', :task => {}}, t3.id => {:decision => 'skip', :task => {}}}
     assert_redirected_to :action => 'index'
@@ -145,56 +145,60 @@ class TasksControllerTest &lt; ActionController::TestCase
   end
   should 'affiliate roles to user after finish add member task' do
-    t = AddMember.create!(:person => profile, :organization => profile)
-    count = profile.members.size
+    community = fast_create(Community)
+    community.add_member(person)
+    another_person = fast_create(Person)
+    t = AddMember.create!(:person => another_person, :organization => community)
+    count = community.members.size
+    @controller.stubs(:profile).returns(community)
     post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
-    profile = Profile.find(@profile.id)
-    assert_equal count + 1, profile.members.size
+    community = Profile.find(community.id)
+    assert_equal count + 1, community.members.size
   end
   should 'display a create ticket form' do
-    get :new, :profile => profile.identifier
+    get :new, :profile => person.identifier
     assert_template 'new'
   end
   should 'add a hidden field with target_id when informed in the URL' do
     friend = create_user('myfriend').person
-    profile.add_friend(friend)
+    person.add_friend(friend)
-    get :new, :profile => profile.identifier, :target_id => friend.id.to_s
+    get :new, :profile => person.identifier, :target_id => friend.id.to_s
     assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'ticket[target_id]', :value => friend.id }
   end
   should 'select friend from list when not already informed' do
-    get :new, :profile => profile.identifier
+    get :new, :profile => person.identifier
     assert_tag :tag => 'select', :attributes => { :name =>  'ticket[target_id]' }
   end
   should 'create a ticket' do
     assert_difference 'Ticket.count' do
-      post :new, :profile => profile.identifier, :ticket => {:name => 'test ticket'}
+      post :new, :profile => person.identifier, :ticket => {:name => 'test ticket'}
     end
   end
   should 'create a ticket with profile requestor' do
-    post :new, :profile => profile.identifier, :ticket => {:name => 'new task'}
-    
-    assert_equal profile, assigns(:ticket).requestor
+    post :new, :profile => person.identifier, :ticket => {:name => 'new task'}
+
+    assert_equal person, assigns(:ticket).requestor
   end
   should 'list tasks that this profile created' do
-    task = Ticket.create!(:name => 'test', :requestor => profile)
-    get :list_requested, :profile => profile.identifier
+    task = Ticket.create!(:name => 'test', :requestor => person)
+    get :list_requested, :profile => person.identifier
     assert_includes assigns(:tasks), task
   end
   should 'list tasks that this profile created without spam' do
-    task_spam = Ticket.create!(:name => 'test', :requestor => profile, :spam => true)
-    task_ham = Ticket.create!(:name => 'test', :requestor => profile, :spam => false)
-    get :list_requested, :profile => profile.identifier
+    task_spam = Ticket.create!(:name => 'test', :requestor => person, :spam => true)
+    task_ham = Ticket.create!(:name => 'test', :requestor => person, :spam => false)
+    get :list_requested, :profile => person.identifier
     assert_includes assigns(:tasks), task_ham
     assert_not_includes assigns(:tasks), task_spam
@@ -202,9 +206,9 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'set target of ticket when creating it' do
      f = create_user('friend').person
-     profile.add_friend f
+     person.add_friend f
-     post :new, :profile => profile.identifier, :ticket => {:name => 'test ticket', :target_id => f.id, :target_type => 'Profile'}
+     post :new, :profile => person.identifier, :ticket => {:name => 'test ticket', :target_id => f.id, :target_type => 'Profile'}
      assert_response :redirect
      assert_equal f, assigns(:ticket).target
@@ -214,9 +218,9 @@ class TasksControllerTest &lt; ActionController::TestCase
     c = fast_create(Community)
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
-    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
-    article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
-    t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
+    c.affiliate(person, Profile::Roles.all_roles(person.environment.id))
+    article = person.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
+    t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => person)
     post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name'}}}
     assert_equal article, c.articles.find_by_name('new_name').reference_article
@@ -227,9 +231,9 @@ class TasksControllerTest &lt; ActionController::TestCase
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     folder = create(Folder, :profile => c, :name => 'test folder')
-    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
-    article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
-    t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
+    c.affiliate(person, Profile::Roles.all_roles(person.environment.id))
+    article = person.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
+    t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => person)
     post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name', :article_parent_id => folder.id}}}
     assert_equal folder, c.articles.find_by_name('new_name').parent
@@ -240,9 +244,9 @@ class TasksControllerTest &lt; ActionController::TestCase
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
     folder = create(Article, :profile => c, :name => 'test folder', :type => 'Folder')
-    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
-    article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
-    t = ApproveArticle.create!(:article => article, :target => c, :requestor => profile)
+    c.affiliate(person, Profile::Roles.all_roles(person.environment.id))
+    article = person.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
+    t = ApproveArticle.create!(:article => article, :target => c, :requestor => person)
     post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name', :article_parent_id => folder.id, :highlighted => true}}}
     assert_equal true, c.articles.find_by_name('new_name').highlighted
@@ -252,9 +256,9 @@ class TasksControllerTest &lt; ActionController::TestCase
     c = fast_create(Community)
     c.update_attributes(:moderated_articles => false)
     @controller.stubs(:profile).returns(c)
-    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
-    article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
-    t = ApproveArticle.create!(:article => article, :target => c, :requestor => profile)
+    c.affiliate(person, Profile::Roles.all_roles(person.environment.id))
+    article = person.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
+    t = ApproveArticle.create!(:article => article, :target => c, :requestor => person)
     post :close, :tasks => {t.id => {:decision => 'finish', :task => {:name => 'new_name', :article_parent_id => ""}}}
     assert_not_nil c.articles.find_by_name('new_name')
@@ -263,7 +267,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'handle blank names for published articles' do
     c = fast_create(Community)
     @controller.stubs(:profile).returns(c)
-    c.affiliate(profile, Profile::Roles.all_roles(c.environment))
+    c.affiliate(person, Profile::Roles.all_roles(c.environment))
     person = create_user('test_user').person
     p_blog = Blog.create!(:profile => person, :name => 'Blog')
     c_blog1 = Blog.create!(:profile => c, :name => 'Blog')
@@ -282,8 +286,8 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'display error if there is an enterprise with the same identifier and keep the task active' do
     e = Environment.default
-    e.add_admin(profile)
-    task = CreateEnterprise.create!(:name => "My Enterprise", :identifier => "my-enterprise", :requestor => profile, :target => e)
+    e.add_admin(person)
+    task = CreateEnterprise.create!(:name => "My Enterprise", :identifier => "my-enterprise", :requestor => person, :target => e)
     enterprise = fast_create(Enterprise, :name => "My Enterprise", :identifier => "my-enterprise")
     assert_nothing_raised do
@@ -299,7 +303,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'render TinyMce Editor when approving suggested article task' do
     Task.destroy_all
     c = fast_create(Community)
-    c.add_admin profile
+    c.add_admin person
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
@@ -311,7 +315,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'create TinyMceArticle article after finish approve suggested article task' do
     TinyMceArticle.destroy_all
     c = fast_create(Community)
-    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
+    c.affiliate(person, Profile::Roles.all_roles(person.environment.id))
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.create!(:article => {:name => 'test name', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
@@ -322,7 +326,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should "change the article's attributes on suggested article task approval" do
     TinyMceArticle.destroy_all
     c = fast_create(Community)
-    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
+    c.affiliate(person, Profile::Roles.all_roles(person.environment.id))
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.new
     t.article = {:name => 'test name', :body => 'test body', :source => 'http://test.com', :source_name => 'some source name'}
@@ -342,7 +346,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should "display name from article suggestion when requestor was not setted" do
     Task.destroy_all
     c = fast_create(Community)
-    c.add_admin profile
+    c.add_admin person
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
@@ -353,7 +357,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should "append hidden tag with type value from article suggestion" do
     Task.destroy_all
     c = fast_create(Community)
-    c.add_admin profile
+    c.add_admin person
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body', :type => 'TextArticle'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
@@ -364,7 +368,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should "display parent_id selection from article suggestion with predefined value" do
     Task.destroy_all
     c = fast_create(Community)
-    c.add_admin profile
+    c.add_admin person
     @controller.stubs(:profile).returns(c)
     parent = fast_create(Folder, :profile_id => c.id)
     t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body', :parent_id => parent.id}, :name => 'some name', :email => 'test@localhost.com', :target => c)
@@ -376,7 +380,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should "not display name from article suggestion when requestor was setted" do
     Task.destroy_all
     c = fast_create(Community)
-    c.add_admin profile
+    c.add_admin person
     @controller.stubs(:profile).returns(c)
     t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :requestor => fast_create(Person), :target => c)
@@ -392,7 +396,7 @@ class TasksControllerTest &lt; ActionController::TestCase
   should 'close create enterprise if trying to cancel even if there is already an existing identifier' do
     identifier = "common-identifier"
-    task = CreateEnterprise.create!(:identifier => identifier, :name => identifier, :requestor => profile, :target => profile)
+    task = CreateEnterprise.create!(:identifier => identifier, :name => identifier, :requestor => person, :target => person)
     fast_create(Profile, :identifier => identifier)
     assert_nothing_raised do
@@ -408,17 +412,17 @@ class TasksControllerTest &lt; ActionController::TestCase
     class FeedDog < Task; end
     Task.stubs(:per_page).returns(3)
     requestor = fast_create(Person)
-    t1 = CleanHouse.create!(:requestor => requestor, :target => profile)
-    t2 = CleanHouse.create!(:requestor => requestor, :target => profile)
-    t3 = FeedDog.create!(:requestor => requestor, :target => profile)
+    t1 = CleanHouse.create!(:requestor => requestor, :target => person)
+    t2 = CleanHouse.create!(:requestor => requestor, :target => person)
+    t3 = FeedDog.create!(:requestor => requestor, :target => person)
-    post :index, :filter_type => t1.type
+    get :index, :filter_type => t1.type
     assert_includes assigns(:tasks), t1
     assert_includes assigns(:tasks), t2
     assert_not_includes assigns(:tasks), t3
-    post :index
+    get :index
     assert_includes assigns(:tasks), t1
     assert_includes assigns(:tasks), t2
@@ -430,9 +434,9 @@ class TasksControllerTest &lt; ActionController::TestCase
     class FeedDog < Task; end
     Task.stubs(:per_page).returns(3)
     requestor = fast_create(Person)
-    t1 = CleanHouse.create!(:requestor => requestor, :target => profile, :data => {:name => 'Task Test'})
-    t2 = CleanHouse.create!(:requestor => requestor, :target => profile)
-    t3 = FeedDog.create!(:requestor => requestor, :target => profile)
+    t1 = CleanHouse.create!(:requestor => requestor, :target => person, :data => {:name => 'Task Test'})
+    t2 = CleanHouse.create!(:requestor => requestor, :target => person)
+    t3 = FeedDog.create!(:requestor => requestor, :target => person)
     get :index, :filter_type => t1.type, :filter_text => 'test'
@@ -447,13 +451,29 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:tasks), t3
   end
+  should 'filter tasks by tags' do
+
+    requestor = fast_create(Person)
+
+    task_one = Task.create!(:requestor => requestor, :target => person, :data => {:name => 'Task Test'})
+    task_two = Task.create!(:requestor => requestor, :target => person, :data => {:name => 'Another Task'})
+
+    person.tag(task_one, with: 'noosfero,test', on: :tags)
+    person.tag(task_two, with: 'test', on: :tags)
+
+    get :index, :filter_tags => 'noosfero'
+
+    assert_includes assigns(:tasks), task_one
+    assert_not_includes assigns(:tasks), task_two
+  end
+
   should 'return tasks ordered accordingly and limited by pages' do
     time = Time.now
-    person = fast_create(Person)
-    t1 = create(Task, :status => Task::Status::ACTIVE, :target => profile, :requestor => person, :created_at => time)
-    t2 = create(Task, :status => Task::Status::ACTIVE, :target => profile, :requestor => person, :created_at => time + 1.second)
-    t3 = create(Task, :status => Task::Status::ACTIVE, :target => profile, :requestor => person, :created_at => time + 2.seconds)
-    t4 = create(Task, :status => Task::Status::ACTIVE, :target => profile, :requestor => person, :created_at => time + 3.seconds)
+    requestor = fast_create(Person)
+    t1 = create(Task, :status => Task::Status::ACTIVE, :target => person, :requestor => requestor, :created_at => time)
+    t2 = create(Task, :status => Task::Status::ACTIVE, :target => person, :requestor => requestor, :created_at => time + 1.second)
+    t3 = create(Task, :status => Task::Status::ACTIVE, :target => person, :requestor => requestor, :created_at => time + 2.seconds)
+    t4 = create(Task, :status => Task::Status::ACTIVE, :target => person, :requestor => requestor, :created_at => time + 3.seconds)
     Task.stubs(:per_page).returns(2)
@@ -469,9 +489,9 @@ class TasksControllerTest &lt; ActionController::TestCase
     Task.stubs(:per_page).returns(3)
     requestor = fast_create(Person)
     responsible = fast_create(Person)
-    t1 = Task.create!(:requestor => requestor, :target => profile, :responsible => responsible)
-    t2 = Task.create!(:requestor => requestor, :target => profile, :responsible => responsible)
-    t3 = Task.create!(:requestor => requestor, :target => profile)
+    t1 = Task.create!(:requestor => requestor, :target => person, :responsible => responsible)
+    t2 = Task.create!(:requestor => requestor, :target => person, :responsible => responsible)
+    t3 = Task.create!(:requestor => requestor, :target => person)
     get :index, :filter_responsible => responsible.id
@@ -661,4 +681,50 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_select ".task_responsible .value"
   end
+  should 'save task tags' do
+    requestor = fast_create(Person)
+
+    task_one = Task.create!(:requestor => requestor, :target => person, :data => {:name => 'Task Test'})
+    post :save_tags, :task_id => task_one.id, :tag_list => 'test'
+
+    assert_includes task_one.tags_from(nil), 'test'
+  end
+
+  should 'tag attribution in one task not affect another' do
+    requestor = fast_create(Person)
+
+    task_one = Task.create!(:requestor => requestor, :target => person, :data => {:name => 'Task Test'})
+    task_two = Task.create!(:requestor => requestor, :target => person, :data => {:name => 'Another Task'})
+
+    post :save_tags, :task_id => task_one.id, :tag_list => 'noosfero,test'
+    post :save_tags, :task_id => task_two.id, :tag_list => 'test'
+
+    assert_not_includes task_two.tags_from(nil), 'noosfero'
+  end
+
+  should 'not tag task without permission' do
+    Role.delete_all
+    requestor = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member(person)
+
+    @controller.stubs(:profile).returns(community)
+    task_one = Task.create!(:requestor => requestor, :target => community, :data => {:name => 'Task Test'})
+
+    post :save_tags, :task_id => task_one.id, :tag_list => 'test'
+
+    assert_not_includes task_one.tags_from(nil), 'test'
+  end
+
+  should 'not tag task with permission but another user' do
+    requestor = fast_create(Person)
+    target = fast_create(Person)
+
+    task_one = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Task Test'})
+
+    post :save_tags, :task_id => task_one.id, :tag_list => 'test'
+
+    assert_not_includes task_one.tags_from(nil), 'test'
+  end
+
 end
@@ -329,7 +329,7 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert_includes Task.to(another_person), t4
   end
-  should 'filter tasks by type with named_scope' do
+  should 'filter tasks by type with named scope' do
     class CleanHouse < Task; end
     class FeedDog < Task; end
     requestor = fast_create(Person)
@@ -345,6 +345,25 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert_includes Task.of(nil), t3
   end
+  should 'filter tasks by tags with named scope' do
+
+    requestor = fast_create(Person)
+    target = fast_create(Person)
+    profile = sample_user
+
+    task_one = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Task Test'})
+    task_two = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Another Task'})
+
+    profile.tag(task_one, with: 'noosfero,test', on: :tags)
+    profile.tag(task_two, with: 'test', on: :tags)
+
+    data = Task.tagged_with('noosfero', any: true)
+
+    assert_includes data, task_one
+    assert_not_includes data, task_two
+
+  end
+
   should 'order tasks by some attribute correctly' do
     Task.destroy_all
     t1 = fast_create(Task, :status => 4, :created_at => Time.now + 1.hour)
@@ -452,6 +471,23 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert_equal person, task.responsible
   end
+  should 'save tasks tags' do
+
+    requestor = fast_create(Person)
+    target = fast_create(Person)
+    profile = sample_user
+
+    task_one = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Task Test'})
+    task_two = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Another Task'})
+
+    profile.tag(task_one, with: 'noosfero,test', on: :tags)
+    profile.tag(task_two, with: 'test', on: :tags)
+
+    assert_includes task_one.tags_from(nil), 'test'
+    assert_not_includes task_two.tags_from(nil), 'noosfero'
+
+  end
+
   protected
   def sample_user
1	class TasksController < MyProfileController	1	class TasksController < MyProfileController
2		2
3	- protect [:perform_task, :view_tasks], :profile, :only => [:index]
4	- protect :perform_task, :profile, :except => [:index]	3	+ protect [:perform_task, :view_tasks], :profile, :only => [:index, :save_tags, :search_tags]
		4	+ protect :perform_task, :profile, :except => [:index, :save_tags, :search_tags]
5		5
6	def index	6	def index
7	@filter_type = params[:filter_type].presence	7	@filter_type = params[:filter_type].presence
8	@filter_text = params[:filter_text].presence	8	@filter_text = params[:filter_text].presence
9	@filter_responsible = params[:filter_responsible]	9	@filter_responsible = params[:filter_responsible]
		10	+ @filter_tags = params[:filter_tags]
		11	+
10	@task_types = Task.pending_types_for(profile)	12	@task_types = Task.pending_types_for(profile)
		13	+ @task_tags = [OpenStruct.new(:name => _('All'), :id => nil) ] + Task.all_tags
11		14
12	@tasks = Task.pending_all(profile, @filter_type, @filter_text).order_by('created_at', 'asc')	15	@tasks = Task.pending_all(profile, @filter_type, @filter_text).order_by('created_at', 'asc')
13	@tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?	16	@tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?
		17	+ @tasks = @tasks.tagged_with(@filter_tags, any: true) if @filter_tags.present?
14	@tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])	18	@tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
15		19
16	@failed = params ? params[:failed] : {}	20	@failed = params ? params[:failed] : {}
	@@ -112,4 +116,36 @@ class TasksController < MyProfileController		@@ -112,4 +116,36 @@ class TasksController < MyProfileController
112	render :json => result.map { \|task\| {:label => task.data[:name], :value => task.data[:name]} }	116	render :json => result.map { \|task\| {:label => task.data[:name], :value => task.data[:name]} }
113	end	117	end
114		118
		119	+ def save_tags
		120	+
		121	+ if request.post? && params[:tag_list]
		122	+ result = {
		123	+ success: false,
		124	+ message: _('Error to save tags. Please, contact the system admin')
		125	+ }
		126	+
		127	+ ActsAsTaggableOn.remove_unused_tags = true
		128	+
		129	+ task = profile.tasks.find_by_id params[:task_id]
		130	+ save = user.tag(task, with: params[:tag_list], on: :tags)
		131	+
		132	+ if save
		133	+ result[:success] = true
		134	+ end
		135	+ end
		136	+
		137	+ render json: result
		138	+ end
		139	+
		140	+ #FIXME make this test
		141	+ # Should not search for article tasks
		142	+ # Should not search for other profile tags
		143	+ # Should search only task tags
		144	+ # Should check the permissions
		145	+ def search_tags
		146	+ arg = params[:term].downcase
		147	+ result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
		148	+ render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
		149	+ end
		150	+
115	end	151	end
	@@ -64,7 +64,7 @@		@@ -64,7 +64,7 @@
64		64
65	<div class="formfieldline">	65	<div class="formfieldline">
66	<div class="formfield tag-list-fields">	66	<div class="formfield tag-list-fields">
67	- <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", task.tag_list.to_s, :size => 36, :class => 'tag-list') %>	67	+ <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", task.tags_from(nil).to_s, :size => 36, :class => 'tag-list','data-submit-values'=>"{'task_id':'#{task.id}'}") %>
68	</div>	68	</div>
69	</div>	69	</div>
70		70
	@@ -35,6 +35,11 @@		@@ -35,6 +35,11 @@
35	</p>	35	</p>
36	<% end %>	36	<% end %>
37	<p>	37	<p>
		38	+ <%= labelled_select(_('Tags')+': ', :filter_tags, :id, :name, @filter_tags, @task_tags, {:id => 'filter-add-tag'}) %>
		39	+ <%= text_field_tag( :filter_tags, @filter_tags, :size => 36, :class => 'filter-tags' ) %>
		40	+ </p>
		41	+
		42	+ <p>
38	<%= submit_button(:search, _('Search')) %>	43	<%= submit_button(:search, _('Search')) %>
39	</p>	44	</p>
40	<% end %>	45	<% end %>
	@@ -94,3 +99,55 @@		@@ -94,3 +99,55 @@
94		99
95		100
96	<%= javascript_include_tag 'tasks' %>	101	<%= javascript_include_tag 'tasks' %>
		102	+
		103	+<script type="text/javascript">
		104	+
		105	+ jQuery('.filter-tags').inputosaurus({
		106	+ hideInput: true
		107	+ });
		108	+
		109	+ $('#filter-add-tag').change(function(){
		110	+
		111	+ if($(this).val() != ''){
		112	+ jQuery('.filter-tags').inputosaurus('addTags',$(this).children(':selected').text());
		113	+ }
		114	+ });
		115	+
		116	+ jQuery('.tag-list').inputosaurus({
		117	+ autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/tasks/search_tags'," %>
		118	+ activateFinalResult: true,
		119	+ submitTags: {
		120	+ url: <%= "'/myprofile/#{profile.identifier}/tasks/save_tags'" %>,
		121	+ beforeSend: function(){
		122	+ this.element.parents('.task_box')
		123	+ .prev('.fg-state-error')
		124	+ .remove();
		125	+ },
		126	+ success: function(response){
		127	+
		128	+ this.element.parents('.task_box')
		129	+ .prev('.fg-state-error')
		130	+ .remove();
		131	+
		132	+ if(!response.success){
		133	+
		134	+ var errorIcon = $('<span/>',{
		135	+ 'class':'ui-icon ui-icon-alert',
		136	+ style:'float: left; margin-right: .3em;'
		137	+ });
		138	+
		139	+ var content = $('<p/>',{
		140	+ html:'<strong>'+response.message+'</strong>'
		141	+ }).prepend(errorIcon);
		142	+
		143	+ var div = $('<div/>',{
		144	+ 'class':'alert fg-state-error ui-state-error'
		145	+ }).append(content);
		146	+
		147	+ this.element.parents('.task_box').before(div);
		148	+ }
		149	+
		150	+ }
		151	+ }
		152	+ })
		153	+</script>
	@@ -329,7 +329,7 @@ class TaskTest < ActiveSupport::TestCase		@@ -329,7 +329,7 @@ class TaskTest < ActiveSupport::TestCase
329	assert_includes Task.to(another_person), t4	329	assert_includes Task.to(another_person), t4
330	end	330	end
331		331
332	- should 'filter tasks by type with named_scope' do	332	+ should 'filter tasks by type with named scope' do
333	class CleanHouse < Task; end	333	class CleanHouse < Task; end
334	class FeedDog < Task; end	334	class FeedDog < Task; end
335	requestor = fast_create(Person)	335	requestor = fast_create(Person)
	@@ -345,6 +345,25 @@ class TaskTest < ActiveSupport::TestCase		@@ -345,6 +345,25 @@ class TaskTest < ActiveSupport::TestCase
345	assert_includes Task.of(nil), t3	345	assert_includes Task.of(nil), t3
346	end	346	end
347		347
		348	+ should 'filter tasks by tags with named scope' do
		349	+
		350	+ requestor = fast_create(Person)
		351	+ target = fast_create(Person)
		352	+ profile = sample_user
		353	+
		354	+ task_one = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Task Test'})
		355	+ task_two = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Another Task'})
		356	+
		357	+ profile.tag(task_one, with: 'noosfero,test', on: :tags)
		358	+ profile.tag(task_two, with: 'test', on: :tags)
		359	+
		360	+ data = Task.tagged_with('noosfero', any: true)
		361	+
		362	+ assert_includes data, task_one
		363	+ assert_not_includes data, task_two
		364	+
		365	+ end
		366	+
348	should 'order tasks by some attribute correctly' do	367	should 'order tasks by some attribute correctly' do
349	Task.destroy_all	368	Task.destroy_all
350	t1 = fast_create(Task, :status => 4, :created_at => Time.now + 1.hour)	369	t1 = fast_create(Task, :status => 4, :created_at => Time.now + 1.hour)
	@@ -452,6 +471,23 @@ class TaskTest < ActiveSupport::TestCase		@@ -452,6 +471,23 @@ class TaskTest < ActiveSupport::TestCase
452	assert_equal person, task.responsible	471	assert_equal person, task.responsible
453	end	472	end
454		473
		474	+ should 'save tasks tags' do
		475	+
		476	+ requestor = fast_create(Person)
		477	+ target = fast_create(Person)
		478	+ profile = sample_user
		479	+
		480	+ task_one = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Task Test'})
		481	+ task_two = Task.create!(:requestor => requestor, :target => target, :data => {:name => 'Another Task'})
		482	+
		483	+ profile.tag(task_one, with: 'noosfero,test', on: :tags)
		484	+ profile.tag(task_two, with: 'test', on: :tags)
		485	+
		486	+ assert_includes task_one.tags_from(nil), 'test'
		487	+ assert_not_includes task_two.tags_from(nil), 'noosfero'
		488	+
		489	+ end
		490	+
455	protected	491	protected
456		492
457	def sample_user	493	def sample_user