Download as
Browse Code »

Commit 1a947629c0c23a89215b4cc493eb38152c4953e1

Authored by Fabio Teixeira
Committed by David Silva
1 parent 92b813da
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

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 @@ @@ -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 @@ @@ -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 class SoftwareDatabase < ActiveRecord::Base 1 class SoftwareDatabase < ActiveRecord::Base
2 - attr_accessible :version, :operating_system 2 + attr_accessible :version
3 3
4 belongs_to :software_info 4 belongs_to :software_info
5 belongs_to :database_description 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 validates_length_of( 9 validates_length_of(
14 - :operating_system, 10 + :version,
15 :maximum => 20, 11 :maximum => 20,
16 :too_long => _("Software database is too long (maximum is 20 characters)") 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 validates( 15 validates(
21 :database_description_id, 16 :database_description_id,
22 :numericality => {:greater_than_or_equal_to => 1} 17 :numericality => {:greater_than_or_equal_to => 1}
lib/software_language.rb
  Diff comments   View file @1a94762
1 class SoftwareLanguage < ActiveRecord::Base 1 class SoftwareLanguage < ActiveRecord::Base
2 - attr_accessible :version, :operating_system 2 + attr_accessible :version
3 3
4 belongs_to :software_info 4 belongs_to :software_info
5 belongs_to :programming_language 5 belongs_to :programming_language
@@ -10,11 +10,5 @@ class SoftwareLanguage &lt; ActiveRecord::Base @@ -10,11 +10,5 @@ class SoftwareLanguage &lt; ActiveRecord::Base
10 :too_long => _("Software language is too long (maximum is 20 characters)") 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 validates_presence_of :version,:programming_language 13 validates_presence_of :version,:programming_language
20 end 14 end
views/profile/_software_tab.html.erb
  Diff comments   View file @1a94762
@@ -54,7 +54,6 @@ @@ -54,7 +54,6 @@
54 <% profile.software_info.software_databases.each do |database| %> 54 <% profile.software_info.software_databases.each do |database| %>
55 <%= display_mpog_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %> 55 <%= display_mpog_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %>
56 <%= display_mpog_field(_('Version:'), database, :version, true) %> 56 <%= display_mpog_field(_('Version:'), database, :version, true) %>
57 - <%= display_mpog_field(_('Operating System:'), database, :operating_system, true) %>  
58 <% end %> 57 <% end %>
59 </table> 58 </table>
60 </td> 59 </td>
@@ -73,7 +72,6 @@ @@ -73,7 +72,6 @@
73 <% profile.software_info.software_languages.each do |language| %> 72 <% profile.software_info.software_languages.each do |language| %>
74 <%= display_mpog_field(_('Name:'), language.programming_language , :name, true) %> 73 <%= display_mpog_field(_('Name:'), language.programming_language , :name, true) %>
75 <%= display_mpog_field(_('Version:'), language, :version, true) %> 74 <%= display_mpog_field(_('Version:'), language, :version, true) %>
76 - <%= display_mpog_field(_('Operating System:'), language, :operating_system, true) %>  
77 <% end %> 75 <% end %>
78 </table> 76 </table>
79 </td> 77 </td>