Download as
Browse Code »

Commit c2f10b561bdf2bfe26a4e28953881a8ee88e0d70

Authored by Arthur Esposte
Committed by Parley
1 parent 50b08148
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

Add relation between user and instituions properly 

(more_inst_for_users)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 1 changed file with 11 additions and 5 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @c2f10b5
... ... @@ -40,7 +40,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
40 40  
41 41 content_tag(:div,
42 42 labelled_form_field(
43   - _('Institution'),
  43 + _('Institutions'),
44 44 content_tag(:div,
45 45 text_field(:institution, :name, :id=>"input_institution"),
46 46 :class => 'institution_container')+
... ... @@ -50,7 +50,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
50 50 content_tag(:div, _("The searched institution does not exist"), :id=>"institution_empty_ajax_message", :class=>"errorExplanation hide-field")+
51 51 link_to(_("Add new institution"), "#", :class=>'button with-text icon-add', :id => 'add_new_institution') +
52 52 link_to(_("Create new institution"), "#", :id=>"create_institution_link", :class=>'button with-text icon-add')+
53   - hidden_field_tag("user[institutions][]", "", :class => 'user_institutions')+
  53 + hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions')+
54 54 hidden_field_tag("institution_selected", "")+
55 55 content_tag("ul", "",:class=>"institutions_added")+
56 56 content_tag(:div, "", :id=>"institution_dialog")
... ... @@ -168,10 +168,16 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
168 168 end
169 169  
170 170  
171   - def custom_user_registration_attributes user, ids
172   - ids.each do |id|
173   - user.institutions << Institution.find(id) if !id.empty?
  171 + def custom_user_registration_attributes user
  172 + unless context.params[:user][:institution_ids].nil?
  173 + context.params[:user][:institution_ids].delete("")
  174 +
  175 + context.params[:user][:institution_ids].each do |institution_id|
  176 + institution = Institution.find institution_id
  177 + user.institutions << institution
  178 + end
174 179 end
  180 + user.save unless user.institution_ids.empty?
175 181  
176 182 user.institutions.each do |institution|
177 183 community = institution.community
... ...