Download as
Browse Code »

Commit 20d8849666eb1f43a6c75e5710bb6acdbdeac271

Authored by Arthur Esposte
1 parent 1d85e3df
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Improve insitution edit page

Showing 2 changed files with 20 additions and 17 deletions   Show diff stats
controllers/gov_user_plugin_myprofile_controller.rb
  Diff comments   View file @20d8849
... ... @@ -6,9 +6,11 @@ class GovUserPluginMyprofileController < MyProfileController
6 6  
7 7 def edit_institution
8 8 @show_sisp_field = environment.admins.include?(current_user.person)
9   - @state_list = NationalRegion.find(:all, :conditions =>
10   - { :national_region_type_id => 2 },
11   - :order => 'name')
  9 + @state_list = NationalRegion.find(
  10 + :all,
  11 + :conditions => { :national_region_type_id => 2 },
  12 + :order => 'name'
  13 + )
12 14 @institution = @profile.institution
13 15 update_institution if request.post?
14 16 end
... ... @@ -26,7 +28,11 @@ class GovUserPluginMyprofileController < MyProfileController
26 28 _("Could not find Governmental Power or Governmental Sphere"))
27 29 end
28 30 end
29   - flash[:errors] = @institution.errors.full_messages unless @institution.valid?
  31 + if @institution.valid?
  32 + redirect_to :controller => 'profile_editor', :action => 'index', :profile => profile.identifier
  33 + else
  34 + flash[:errors] = @institution.errors.full_messages
  35 + end
30 36 end
31 37  
32 38 def governmental_updates
... ...
views/gov_user_plugin_myprofile/edit_institution.html.erb
  Diff comments   View file @20d8849
... ... @@ -6,23 +6,20 @@
6 6 </div>
7 7 <%end %>
8 8  
9   -<% unless flash[:errors].nil? %>
10   -<div class="errorExplanation" id="errorExplanation">
11   - <h2> <%= _("Can`t create new Institution: #{flash[:errors].length} errors") %> </h2>
12   - <ul>
13   - <% flash[:errors].each do |error| %>
14   - <li> <%= error %> </li>
15   - <% end %>
16   - </ul>
17   -</div>
  9 +<% unless flash[:errors].blank? %>
  10 + <div class="errorExplanation" id="errorExplanation">
  11 + <h2> <%= _("Can`t create new Institution: #{flash[:errors].length} errors") %> </h2>
  12 + <ul>
  13 + <% flash[:errors].each do |error| %>
  14 + <li> <%= error %> </li>
  15 + <% end %>
  16 + </ul>
  17 + </div>
18 18 <% end %>
19 19  
20 20 <div id = 'create_institution_errors' class='errorExplanation hide-field'></div>
21 21  
22 22 <div>
23   - <div class="fields-required">
24   - <span class="errorExplanation"><%= _("All fields with (*) are mandatory") %></span>
25   - </div>
26 23 <%= labelled_form_for :community,:html => { :multipart => true, :id=>"institution_form" } do |f| %>
27 24 <%= hidden_field_tag "edit_institution_page", true %>
28 25 <%= fields_for :institutions do |inst| %>
... ... @@ -61,7 +58,7 @@
61 58 <%= required f.text_field(:city, :value => @institution.community.city) %>
62 59  
63 60  
64   - <span class='required-field'>
  61 + <span class='optional-field'>
65 62 <div class="formfield type-text">
66 63 <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %>
67 64 <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => @institution.cnpj) %>
... ...