Added new attribute to Work_assignment article type

Added default email message attribute to be sent when user choose to notify somebody. Refactored build_email_message method that attaches the URL of the uploaded files to the email message. Added Java Script to fill in the email field with an example. Removed destroy action method on plugin cms controller, now using the existent in the core cms controller.

Added new attribute to Work_assignment article type
Added default email message attribute to be sent when user choose to notify somebody. Refactored build_email_message method that attaches the URL of the uploaded files to the email message. Added Java Script to fill in the email field with an example. Removed destroy action method on plugin cms controller, now using the existent in the core cms controller.
Tallys Martins
1 parent e6c0328a
Showing 9 changed files with 56 additions and 42 deletions Show diff stats
lib/noosfero/plugin.rb
plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
plugins/work_assignment/lib/ext/email_contact.rb
plugins/work_assignment/lib/work_assignment_plugin.rb
plugins/work_assignment/lib/work_assignment_plugin/helper.rb
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
plugins/work_assignment/public/text_field_css.js
plugins/work_assignment/views/cms/_notify_text_field.html.erb
plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb
@@ -417,6 +417,8 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Adds adicional fields to a view
+  # returns = proc block that creates html code
   def article_extra_fields(article)
     nil
   end
@@ -532,12 +534,6 @@ class Noosfero::Plugin
     params
   end
  
-  # -> Checks adicional parameters passed through html 
-  # by the work_assignment plugin 
-  def check_extra_parameters(uploaded_files, params = {})
-    nil
-  end
-
   # -> Finds objects by their contents
   # returns = {:results => [a, b, c, ...], ...}
   # P.S.: The plugin might add other informations on the return hash for its
 class WorkAssignmentPluginCmsController < CmsController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
  
-  def destroy
-    @article = profile.articles.find(params[:id])
-    if request.post?
-      @article.destroy
-      session[:notice] = _("\"#{@article.name}\" was removed.")
-      referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
-      redirect_to referer
-    end
-  end
 end
 \ No newline at end of file
@@ -53,18 +53,14 @@ class EmailContact
     end
   end
  
-  def build_mail_message(environment, files_ids, parent_name)
-    @files_paths = []
-    @message
-    @files_string = files_ids
-    @files_id_list = @files_string.split(' ')
-
-    @files_id_list.each do |file_id|
-      @file = environment.articles.find_by_id(file_id)
-      @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}"
-      @files_paths << @real_file_url
-      @message = "<br>A file was sent to #{parent_name} and you are being notified."
-      @message += "<br> Click <a href='#{@real_file_url}'>here</a> to access the file or use the URL below: <br>"
+  def build_mail_message(environment, uploaded_files, parent_id)
+    @article = environment.articles.find_by_id(parent_id)
+    @message = ""
+    if !@article.nil? && @article.type == "WorkAssignmentPlugin::WorkAssignment"
+      @message = @article.default_email + "<br>"
+    end
+    uploaded_files.each do |file|
+      @real_file_url = "http://#{file.url[:host]}:#{file.url[:port]}/#{file.url[:profile]}/#{file.path}"
       @message += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
     end
     @message
@@ -53,15 +53,16 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
  
   def cms_controller_filters
     block = proc do
-      @email_notification = params[:article_email_notification]
-      if !@email_notification.nil? and @email_notification.include? "@" 
-        @subject = "#{@parent.name} file submission"
-        @email_contact = user.build_email_contact(:name => user.name, :subject => @subject, :email => user.email, :receiver => @email_notification, :sender => user)
-        @email_contact.message = @email_contact.build_mail_message(environment, @uploaded_files, @parent.name)
-        if @email_contact.deliver
-          session[:notice] = _('Notification successfully sent')
-        else
-          session[:notice] = _('Notification not sent')
+      if request.post? && params[:uploaded_files]
+        @email_notification = params[:article_email_notification]
+        unless @email_notification.include? "example@example.com, example2@example.com.br"
+          @email_contact = user.build_email_contact(:name => user.name, :subject => @parent.name, :email => user.email, :receiver => @email_notification, :sender => user)
+          @email_contact.message = @email_contact.build_mail_message(environment, @uploaded_files, @parent.id)
+          if @email_contact.deliver
+            session[:notice] = _('Notification successfully sent')
+          else
+            session[:notice] = _('Notification not sent')
+          end
         end
       end
     end
@@ -76,8 +77,8 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
     proc do
         @article = Article.find_by_id(article)
         if params[:parent_id] && !@article.nil? && @article.type == "WorkAssignmentPlugin::WorkAssignment"
-          render :partial => 'notify_text_field',  :locals => { :size => '45'} 
-        end      
+          render :partial => 'notify_text_field',  :locals => { :size => '45'}
+        end
     end
   end
  
@@ -64,6 +64,6 @@ module WorkAssignmentPlugin::Helper
   end
  
   def display_delete_button(article)
-    expirable_button article, :delete, _('Delete'), {:controller =>'work_assignment_plugin_cms', :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+    expirable_button article, :delete, _('Delete'), {:controller =>'cms', :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
   end
 end
 class WorkAssignmentPlugin::WorkAssignment < Folder
  
   settings_items :publish_submissions, :type => :boolean, :default => false
-  settings_items :email_notification, :type => :boolean, :default => false
+  settings_items :default_email, :type => :string, :default => ""
  
   attr_accessible :publish_submissions
-  attr_accessible :email_notification
+  attr_accessible :default_email
  
   def self.icon_name(article = nil)
     'work-assignment'
@@ -0,0 +1,22 @@
+  var element = jQuery("input[name='article_email_notification']");
+  var initialVal="example@example.com, example2@example.com.br";
+  var isEdited=false;
+  element.val(initialVal);
+
+  element.focus(function(){
+    if(!isEdited){
+        element.val("");
+        isEdited=true;
+    }
+
+  });
+
+  element.blur(function(){
+    if(element.val()==""){
+        element.val(initialVal);
+        isEdited=false;
+    }
+
+  });
+
+
-<%= labelled_text_field(_('Send notification to: '), 'article_email_notification') %>
 \ No newline at end of file
+<h5><%= _('If you want to notify someone about this action, fill the field below with the emails of the destinies, separated by comma.') %></h5>
+
+<%= labelled_text_field(_('Send notification to: '), 'article_email_notification', "", :style => 'width: 60%;') %>
+
+<%= javascript_include_tag '../plugins/work_assignment/text_field_css' %>
 \ No newline at end of file
 <%= render :partial => 'folder', :locals => {:f => f} %>
+
+<%= labelled_form_field(_('Default email message:'), text_area(:article, :default_email, :rows => 3, :cols => 64)) %>
+
 <%=labelled_check_box(_('Publish submissions'), 'article[publish_submissions]', true, @article.publish_submissions) %>
+
...	...	@@ -417,6 +417,8 @@ class Noosfero::Plugin
417	417	nil
418	418	end
419	419
	420	+ # -> Adds adicional fields to a view
	421	+ # returns = proc block that creates html code
420	422	def article_extra_fields(article)
421	423	nil
422	424	end
...	...	@@ -532,12 +534,6 @@ class Noosfero::Plugin
532	534	params
533	535	end
534	536
535		- # -> Checks adicional parameters passed through html
536		- # by the work_assignment plugin
537		- def check_extra_parameters(uploaded_files, params = {})
538		- nil
539		- end
540		-
541	537	# -> Finds objects by their contents
542	538	# returns = {:results => [a, b, c, ...], ...}
543	539	# P.S.: The plugin might add other informations on the return hash for its
...	...
1	1	class WorkAssignmentPluginCmsController < CmsController
2	2	append_view_path File.join(File.dirname(__FILE__) + '/../../views')
3	3
4		- def destroy
5		- @article = profile.articles.find(params[:id])
6		- if request.post?
7		- @article.destroy
8		- session[:notice] = _("\"#{@article.name}\" was removed.")
9		- referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
10		- redirect_to referer
11		- end
12		- end
13	4	end
14	5	\ No newline at end of file
...	...
...	...	@@ -53,18 +53,14 @@ class EmailContact
53	53	end
54	54	end
55	55
56		- def build_mail_message(environment, files_ids, parent_name)
57		- @files_paths = []
58		- @message
59		- @files_string = files_ids
60		- @files_id_list = @files_string.split(' ')
61		-
62		- @files_id_list.each do \|file_id\|
63		- @file = environment.articles.find_by_id(file_id)
64		- @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}"
65		- @files_paths << @real_file_url
66		- @message = "<br>A file was sent to #{parent_name} and you are being notified."
67		- @message += "<br> Click <a href='#{@real_file_url}'>here</a> to access the file or use the URL below: <br>"
	56	+ def build_mail_message(environment, uploaded_files, parent_id)
	57	+ @article = environment.articles.find_by_id(parent_id)
	58	+ @message = ""
	59	+ if !@article.nil? && @article.type == "WorkAssignmentPlugin::WorkAssignment"
	60	+ @message = @article.default_email + "<br>"
	61	+ end
	62	+ uploaded_files.each do \|file\|
	63	+ @real_file_url = "http://#{file.url[:host]}:#{file.url[:port]}/#{file.url[:profile]}/#{file.path}"
68	64	@message += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
69	65	end
70	66	@message
...	...
...	...	@@ -53,15 +53,16 @@ class WorkAssignmentPlugin < Noosfero::Plugin
53	53
54	54	def cms_controller_filters
55	55	block = proc do
56		- @email_notification = params[:article_email_notification]
57		- if !@email_notification.nil? and @email_notification.include? "@"
58		- @subject = "#{@parent.name} file submission"
59		- @email_contact = user.build_email_contact(:name => user.name, :subject => @subject, :email => user.email, :receiver => @email_notification, :sender => user)
60		- @email_contact.message = @email_contact.build_mail_message(environment, @uploaded_files, @parent.name)
61		- if @email_contact.deliver
62		- session[:notice] = _('Notification successfully sent')
63		- else
64		- session[:notice] = _('Notification not sent')
	56	+ if request.post? && params[:uploaded_files]
	57	+ @email_notification = params[:article_email_notification]
	58	+ unless @email_notification.include? "example@example.com, example2@example.com.br"
	59	+ @email_contact = user.build_email_contact(:name => user.name, :subject => @parent.name, :email => user.email, :receiver => @email_notification, :sender => user)
	60	+ @email_contact.message = @email_contact.build_mail_message(environment, @uploaded_files, @parent.id)
	61	+ if @email_contact.deliver
	62	+ session[:notice] = _('Notification successfully sent')
	63	+ else
	64	+ session[:notice] = _('Notification not sent')
	65	+ end
65	66	end
66	67	end
67	68	end
...	...	@@ -76,8 +77,8 @@ class WorkAssignmentPlugin < Noosfero::Plugin
76	77	proc do
77	78	@article = Article.find_by_id(article)
78	79	if params[:parent_id] && !@article.nil? && @article.type == "WorkAssignmentPlugin::WorkAssignment"
79		- render :partial => 'notify_text_field', :locals => { :size => '45'}
80		- end
	80	+ render :partial => 'notify_text_field', :locals => { :size => '45'}
	81	+ end
81	82	end
82	83	end
83	84
...	...
...	...	@@ -64,6 +64,6 @@ module WorkAssignmentPlugin::Helper
64	64	end
65	65
66	66	def display_delete_button(article)
67		- expirable_button article, :delete, _('Delete'), {:controller =>'work_assignment_plugin_cms', :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
	67	+ expirable_button article, :delete, _('Delete'), {:controller =>'cms', :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
68	68	end
69	69	end
...	...
1	1	class WorkAssignmentPlugin::WorkAssignment < Folder
2	2
3	3	settings_items :publish_submissions, :type => :boolean, :default => false
4		- settings_items :email_notification, :type => :boolean, :default => false
	4	+ settings_items :default_email, :type => :string, :default => ""
5	5
6	6	attr_accessible :publish_submissions
7		- attr_accessible :email_notification
	7	+ attr_accessible :default_email
8	8
9	9	def self.icon_name(article = nil)
10	10	'work-assignment'
...	...
...	...	@@ -0,0 +1,22 @@
	1	+ var element = jQuery("input[name='article_email_notification']");
	2	+ var initialVal="example@example.com, example2@example.com.br";
	3	+ var isEdited=false;
	4	+ element.val(initialVal);
	5	+
	6	+ element.focus(function(){
	7	+ if(!isEdited){
	8	+ element.val("");
	9	+ isEdited=true;
	10	+ }
	11	+
	12	+ });
	13	+
	14	+ element.blur(function(){
	15	+ if(element.val()==""){
	16	+ element.val(initialVal);
	17	+ isEdited=false;
	18	+ }
	19	+
	20	+ });
	21	+
	22	+
...	...
1		-<%= labelled_text_field(_('Send notification to: '), 'article_email_notification') %>
2	1	\ No newline at end of file
	2	+<h5><%= _('If you want to notify someone about this action, fill the field below with the emails of the destinies, separated by comma.') %></h5>
	3	+
	4	+<%= labelled_text_field(_('Send notification to: '), 'article_email_notification', "", :style => 'width: 60%;') %>
	5	+
	6	+<%= javascript_include_tag '../plugins/work_assignment/text_field_css' %>
3	7	\ No newline at end of file
...	...
1	1	<%= render :partial => 'folder', :locals => {:f => f} %>
	2	+
	3	+<%= labelled_form_field(_('Default email message:'), text_area(:article, :default_email, :rows => 3, :cols => 64)) %>
	4	+
2	5	<%=labelled_check_box(_('Publish submissions'), 'article[publish_submissions]', true, @article.publish_submissions) %>
	6	+
...	...