Download as
Browse Code »

Commit 04ac44270f95acfdc3b8a3b5aaf836a39fdcc498

Authored by Fabio Teixeira
Committed by Gabriela Navarro
1 parent 673c1bce
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

fix_institution: Add errors messages when fail to create a new institution 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 2 changed files with 15 additions and 9 deletions   Show diff stats
controllers/mpog_software_plugin_controller.rb
  Diff comments   View file @04ac442
... ... @@ -46,10 +46,6 @@ class MpogSoftwarePluginController &lt; ApplicationController
46 46 end
47 47 end
48 48  
49   - def create_institution_admin
50   - @url_token = split_http_referer request.original_url()
51   - end
52   -
53 49 def split_http_referer http_referer
54 50 split_list = []
55 51 split_list = http_referer.split("/")
... ... @@ -57,11 +53,15 @@ class MpogSoftwarePluginController &lt; ApplicationController
57 53 return @url_token
58 54 end
59 55  
  56 + def create_institution_admin
  57 + @url_token = split_http_referer request.original_url()
  58 + end
  59 +
60 60 def new_institution
61 61 if !params[:community].nil? and !params[:institutions].nil?
62 62 response_message = {}
63 63  
64   - institution = private_create_institution
  64 + institution = private_create_institution()
65 65  
66 66 response_message = if institution.errors.full_messages.empty? and institution.valid? and institution.save
67 67 {:success => true, :message => _("Institution successful created!"), :institution_data=>{:name=>institution.name, :id=>institution.id}}
... ... @@ -73,7 +73,13 @@ class MpogSoftwarePluginController &lt; ApplicationController
73 73 render :json => response_message.to_json
74 74 else
75 75 session[:notice] = response_message[:message] # consume the notice
76   - redirect_to :controller => "/admin_panel", :action => "index"
  76 +
  77 + if response_message[:success]
  78 + redirect_to :controller => "/admin_panel", :action => "index"
  79 + else
  80 + flash[:errors] = response_message[:errors]
  81 + redirect_to :controller => "mpog_software_plugin", :action => "create_institution_admin"
  82 + end
77 83 end
78 84 else
79 85 redirect_to "/"
... ...
views/mpog_software_plugin/_institution.html.erb
  Diff comments   View file @04ac442
... ... @@ -6,11 +6,11 @@
6 6 </div>
7 7 <%end %>
8 8  
9   -<% unless @errors.blank? %>
  9 +<% unless flash[:errors].nil? %>
10 10 <div class="errorExplanation" id="errorExplanation">
11   - <h2> <%= _("Can`t create new Institution: #{@errors.length} errors") %> </h2>
  11 + <h2> <%= _("Can`t create new Institution: #{flash[:errors].length} errors") %> </h2>
12 12 <ul>
13   - <% @errors.each do |error| %>
  13 + <% flash[:errors].each do |error| %>
14 14 <li> <%= error %> </li>
15 15 <% end %>
16 16 </ul>
... ...