[Git][noosfero/noosfero][master] 2 commits: Problem recurrent about change subtitle on block edition provoking profile unavailability

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
8a94d23e by Raphael Matos da Costa at 2018-07-12T21:15:28Z
Problem recurrent about change subtitle on block edition provoking profile unavailability
- - - - -
59722ab2 by Rodrigo Souto at 2018-07-13T18:56:07Z
Merge branch 'patch-5' into 'master'

Problem recurrent about change subtitle on block edition provoking profile unavailability

See merge request noosfero/noosfero!1570
- - - - -


1 changed file:

- plugins/custom_forms/lib/custom_forms_plugin/list_block.rb


Changes:

=====================================
plugins/custom_forms/lib/custom_forms_plugin/list_block.rb
=====================================
@@ -22,10 +22,10 @@ module CustomFormsPlugin::ListBlock
 
   def list_forms(user)
     forms = owner.forms.accessible_to(user, owner)
-                       .send(status)
-                       .by_kind(self.type)
+    forms = forms.send(status) unless status == 'all'
+    forms = forms.by_kind(self.type)
     forms = filtered_ids.present? ? forms.where(id: filtered_ids) : forms
-    forms.order(:ending).first(limit)
+    forms.order(:ending).first(limit.to_i)
   end
 
   def valid_status



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/fd202fb7764725e211c1fb058f98e629dc8b78a3...59722ab2112280ea29c92374e5783e2edb33163c

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/fd202fb7764725e211c1fb058f98e629dc8b78a3...59722ab2112280ea29c92374e5783e2edb33163c
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/20180713/e36564b2/attachment-0001.html>