[Git][noosfero/noosfero][stable-1.10] Merge branch 'article_highlighting' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero


Commits:
6deb4faa by Rodrigo Souto at 2017-11-30T15:27:21+00:00
Merge branch 'article_highlighting' into 'master'

If article parent is highlighted, the article will be highlighted

Closes #292

See merge request noosfero/noosfero!1351

(cherry picked from commit ac74e5863601cad94aa874577003a01ca4fa1d28)

239d6403 If article parent is highlighted, the article will be highlighted
f2e1b759 Default highlight value is the same as the current parents' highlighted value
- - - - -


1 changed file:

- app/controllers/my_profile/cms_controller.rb


Changes:

=====================================
app/controllers/my_profile/cms_controller.rb
=====================================
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -147,6 +147,7 @@ class CmsController < MyProfileController
       @article.parent = parent
       @article.published = parent.published
       @article.show_to_followers = parent.show_to_followers
+      @article.highlighted = parent.highlighted
       @parent_id = parent.id
     end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/6deb4faa730da0c77d20ab177237a7181673dc3c

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/6deb4faa730da0c77d20ab177237a7181673dc3c
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/20171130/666e2a45/attachment-0001.html>