[Git][noosfero/noosfero][stable-1.10] Merge branch 'newsletter-set-person' into 'master'
Rodrigo Souto
gitlab at mg.gitlab.com
Fri Jan 5 11:36:12 BRST 2018
Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero
Commits:
90b8406e by Rodrigo Souto at 2018-01-05T13:35:40+00:00
Merge branch 'newsletter-set-person' into 'master'
newsletter-plugin: set person on object
See merge request noosfero/noosfero!1356
(cherry picked from commit 9505f4100353d6b60761a5cc775ea3fd22cb1460)
08bbcd66 newsletter-plugin: set person on object
- - - - -
1 changed file:
- plugins/newsletter/controllers/newsletter_plugin_admin_controller.rb
Changes:
=====================================
plugins/newsletter/controllers/newsletter_plugin_admin_controller.rb
=====================================
--- a/plugins/newsletter/controllers/newsletter_plugin_admin_controller.rb
+++ b/plugins/newsletter/controllers/newsletter_plugin_admin_controller.rb
@@ -6,8 +6,7 @@ class NewsletterPluginAdminController < PluginAdminController
if request.post?
# token input gives the param as a comma separated string
params[:newsletter][:blog_ids] = (params[:newsletter][:blog_ids] || '').split(',')
-
- params[:newsletter][:person_id] = user.id
+ @newsletter.person_id = user.id
file = params[:file]
if file && file[:recipients].present?
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/90b8406e452188e011ad59a98486c7b5c0966f51
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/90b8406e452188e011ad59a98486c7b5c0966f51
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180105/eb471811/attachment.html>
More information about the Noosfero-dev
mailing list