Download as
Browse Code »

Commit 70f9eff6ba46e59983e225f9df2a71a64f44c1a5

Authored by Gabriela Navarro
1 parent 149906fb
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

Fixing the user references 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com
Showing 4 changed files with 29 additions and 15 deletions   Show diff stats
db/migrate/20140528193816_add_extra_fields_to_user.rb 0 → 100644
  Diff comments   View file @70f9eff
... ... @@ -0,0 +1,17 @@
  1 +class AddExtraFieldsToUser < ActiveRecord::Migration
  2 + def self.up
  3 + change_table :users do |t|
  4 + t.string :secondary_email
  5 + t.references :institution
  6 + t.string :role
  7 + end
  8 + end
  9 +
  10 + def self.down
  11 + change_table :users do |t|
  12 + t.remove :secondary_email
  13 + t.remove_references :institution
  14 + t.remove :role
  15 + end
  16 + end
  17 +end
... ...
db/migrate/20150408121921_add_extra_fields_to_gov_user.rb
View file @149906f
... ... @@ -1,15 +0,0 @@
1   -class AddExtraFieldsToGovUser < ActiveRecord::Migration
2   - def self.up
3   - change_table :users do |t|
4   - t.string :secondary_email
5   - t.string :role
6   - end
7   - end
8   -
9   - def self.down
10   - change_table :users do |t|
11   - t.remove :secondary_email
12   - t.remove :role
13   - end
14   - end
15   -end
lib/ext/person.rb
  Diff comments   View file @70f9eff
... ... @@ -18,4 +18,14 @@ class Person
18 18 self.user.secondary_email = value unless self.user.nil?
19 19 end
20 20  
  21 + def institutions
  22 + institutions = []
  23 + unless self.user.institutions.nil?
  24 + self.user.institutions.each do |institution|
  25 + institutions << institution.name
  26 + end
  27 + end
  28 + institutions
  29 + end
  30 +
21 31 end
... ...
lib/ext/user.rb
  Diff comments   View file @70f9eff
... ... @@ -4,6 +4,8 @@ class User
4 4  
5 5 GOV_SUFFIX = /^.*@[gov.br|jus.br|leg.br|mp.br]+$/
6 6  
  7 + has_and_belongs_to_many :institutions
  8 +
7 9 validate :email_different_secondary?, :email_has_already_been_used?,
8 10 :secondary_email_format, :email_suffix_is_gov?
9 11  
... ...