[Git][noosfero/noosfero][master-1.x] 2 commits: Fixes selected value on city and state fields

[Rodrigo Souto]

Rodrigo Souto pushed to branch master-1.x at Noosfero / noosfero


Commits:
efca0fc0 by Gabriel Silva at 2018-05-24T14:14:41Z
Fixes selected value on city and state fields

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
e3abfab5 by Rodrigo Souto at 2018-05-25T14:16:16Z
Merge branch 'fix-location-selects' into 'master-1.x'

Fixes selected value on city and state fields

See merge request noosfero/noosfero!1502
- - - - -


1 changed file:

- app/helpers/profile_editor_helper.rb


Changes:

=====================================
app/helpers/profile_editor_helper.rb
=====================================
--- a/app/helpers/profile_editor_helper.rb
+++ b/app/helpers/profile_editor_helper.rb
@@ -116,8 +116,8 @@ module ProfileEditorHelper
     if profile.state.present? &&
        !states.find { |c| c[1] == profile.metadata['state'] }
       states.unshift [profile.state, profile.state]
-      options[:selected] = profile.metadata['state']
     end
+    options[:selected] = profile.metadata['state']
     select(object_name, :state, [[_('Select a state...'), nil]] + states, options, html_options)
   end
 
@@ -128,8 +128,8 @@ module ProfileEditorHelper
     if profile.city.present? &&
        !cities.find { |c| c[1] == profile.metadata['city'] }
       cities.unshift [profile.city, profile.city]
-      options[:selected] = profile.metadata['city']
     end
+    options[:selected] = profile.metadata['city']
     select(object_name, :city, [[_('Select a city...'), nil]] + cities, options, html_options)
   end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/6f941831271e41257f1b6c9c84f7f4003c1c4533...e3abfab53d341500d39ebd25c78386843435d356

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/6f941831271e41257f1b6c9c84f7f4003c1c4533...e3abfab53d341500d39ebd25c78386843435d356
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/20180525/22d14847/attachment-0001.html>