[Git][noosfero/noosfero][master] 5 commits: custom-forms: load style without specific extension

[Gabriel Silva]

Gabriel Silva pushed to branch master at Noosfero / noosfero


Commits:
e6b9afcf by Rodrigo Souto at 2019-08-01T18:34:28Z
custom-forms: load style without specific extension

- - - - -
d9117fb1 by Rodrigo Souto at 2019-08-01T18:34:52Z
custom-forms: convert paremters to hash on answers

- - - - -
d7d8b85e by Rodrigo Souto at 2019-08-01T18:35:25Z
custom-forms: change vote from answer on confirmation message

- - - - -
f9604a6c by Alax Alves at 2019-08-28T18:56:01Z
Merge branch 'master' of https://gitlab.com/noosfero/noosfero into diguliu/noosfero-custom-forms-fix

- - - - -
204aa64b by Gabriel Silva at 2019-08-30T01:06:44Z
Merge branch 'custom-forms-fix-diguliu' into 'master'

Custom Forms Fix

See merge request noosfero/noosfero!1742
- - - - -


3 changed files:

- app/helpers/layout_helper.rb
- plugins/custom_forms/lib/custom_forms_plugin/submission.rb
- plugins/custom_forms/views/shared/_form.html.erb


Changes:

=====================================
app/helpers/layout_helper.rb
=====================================
@@ -48,8 +48,9 @@ module LayoutHelper
 
   def noosfero_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
-      plugin.class.public_path('style.css', true)
+      plugin.class.public_path('style', true)
     }
+
     global_css_pub = "/designs/themes/#{session[:theme] || environment.theme}/global.css"
     global_css_at_fs = Rails.root.join 'public' + global_css_pub
 


=====================================
plugins/custom_forms/lib/custom_forms_plugin/submission.rb
=====================================
@@ -50,7 +50,8 @@ class CustomFormsPlugin::Submission < ApplicationRecord
   def chosen_alternatives_from_value(value)
     begin
       alternatives = []
-
+      value = value.to_h if value.kind_of?(::ActionController::Parameters)
+      
       if value.kind_of?(String)
         alternatives << CustomFormsPlugin::Alternative.find(value) if (value.to_i > 0)
       end


=====================================
plugins/custom_forms/views/shared/_form.html.erb
=====================================
@@ -15,10 +15,10 @@
     <% label = form.kind == 'poll' ? _('Vote!') : _('Send') %>
     <% if form.expired? %>
       <%= submit_button :save, label, disabled: '', class: 'disabled',
-                        data: { confirm: _('Are you sure your want to submit your vote?') } %>
+                        data: { confirm: _('Are you sure your want to submit your answer?') } %>
     <% else %>
       <%= submit_button :save, label,
-                        data: { confirm: _('Are you sure your want to submit your vote?') } %>
+                        data: { confirm: _('Are you sure your want to submit your answer?') } %>
     <% end %>
     <%= button :back, _('Go back'), controller: :profile, profile: profile.identifier %>
   <% end %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/a2e37f02622b2c0a19bfca74523de9a6ccf90645...204aa64b87aa8cb29064f7c9e1087f08407d5be9

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/a2e37f02622b2c0a19bfca74523de9a6ccf90645...204aa64b87aa8cb29064f7c9e1087f08407d5be9
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/20190830/119c3533/attachment-0001.html>