Download as
Browse Code »

Commit 1a947629c0c23a89215b4cc493eb38152c4953e1

Authored by Fabio Teixeira
Committed by David Silva
1 parent 92b813da
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

Remove operating system from models and views of software database and languages 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 5 changed files with 22 additions and 17 deletions   Show diff stats
db/migrate/20141216183111_remove_operating_system_from_software_database.rb 0 → 100644
  Diff comments   View file @1a94762
... ... @@ -0,0 +1,9 @@
  1 +class RemoveOperatingSystemFromSoftwareDatabase < ActiveRecord::Migration
  2 + def up
  3 + remove_column :software_databases, :operating_system
  4 + end
  5 +
  6 + def down
  7 + add_column :software_databases, :operating_system, :string
  8 + end
  9 +end
... ...
db/migrate/20141216183459_remove_operating_system_from_software_language.rb 0 → 100644
  Diff comments   View file @1a94762
... ... @@ -0,0 +1,9 @@
  1 +class RemoveOperatingSystemFromSoftwareLanguage < ActiveRecord::Migration
  2 + def up
  3 + remove_column :software_languages, :operating_system
  4 + end
  5 +
  6 + def down
  7 + add_column :software_languages, :operating_system, :string
  8 + end
  9 +end
... ...
lib/software_database.rb
  Diff comments   View file @1a94762
1 1 class SoftwareDatabase < ActiveRecord::Base
2   - attr_accessible :version, :operating_system
  2 + attr_accessible :version
3 3  
4 4 belongs_to :software_info
5 5 belongs_to :database_description
6 6  
7   - validates_length_of(
8   - :version,
9   - :maximum => 20,
10   - :too_long => _("Software database is too long (maximum is 20 characters)")
11   - )
  7 + validates_presence_of :database_description_id, :version
12 8  
13 9 validates_length_of(
14   - :operating_system,
  10 + :version,
15 11 :maximum => 20,
16 12 :too_long => _("Software database is too long (maximum is 20 characters)")
17 13 )
18 14  
19   - validates_presence_of :database_description_id, :version
20 15 validates(
21 16 :database_description_id,
22 17 :numericality => {:greater_than_or_equal_to => 1}
... ...
lib/software_language.rb
  Diff comments   View file @1a94762
1 1 class SoftwareLanguage < ActiveRecord::Base
2   - attr_accessible :version, :operating_system
  2 + attr_accessible :version
3 3  
4 4 belongs_to :software_info
5 5 belongs_to :programming_language
... ... @@ -10,11 +10,5 @@ class SoftwareLanguage &lt; ActiveRecord::Base
10 10 :too_long => _("Software language is too long (maximum is 20 characters)")
11 11 )
12 12  
13   - validates_length_of(
14   - :operating_system,
15   - :maximum => 20,
16   - :too_long => _("Software language is too long (maximum is 20 characters)")
17   - )
18   -
19 13 validates_presence_of :version,:programming_language
20 14 end
... ...
views/profile/_software_tab.html.erb
  Diff comments   View file @1a94762
... ... @@ -54,7 +54,6 @@
54 54 <% profile.software_info.software_databases.each do |database| %>
55 55 <%= display_mpog_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %>
56 56 <%= display_mpog_field(_('Version:'), database, :version, true) %>
57   - <%= display_mpog_field(_('Operating System:'), database, :operating_system, true) %>
58 57 <% end %>
59 58 </table>
60 59 </td>
... ... @@ -73,7 +72,6 @@
73 72 <% profile.software_info.software_languages.each do |language| %>
74 73 <%= display_mpog_field(_('Name:'), language.programming_language , :name, true) %>
75 74 <%= display_mpog_field(_('Version:'), language, :version, true) %>
76   - <%= display_mpog_field(_('Operating System:'), language, :operating_system, true) %>
77 75 <% end %>
78 76 </table>
79 77 </td>
... ...