Download as
Browse Code »

Commit 418a9a7c91586624e47dec94a7ba1b3f32c4491d

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

Remove row operating_system from software_database and software_language 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 5 changed files with 29 additions and 74 deletions   Show diff stats
lib/database_helper.rb
  Diff comments   View file @418a9a7
@@ -88,12 +88,7 @@ module DatabaseHelper @@ -88,12 +88,7 @@ module DatabaseHelper
88 label: DynamicTableHelper::LABEL_TEXT[:version], 88 label: DynamicTableHelper::LABEL_TEXT[:version],
89 value: database_data[:version], 89 value: database_data[:version],
90 name: COLLUMN_NAME[:version], 90 name: COLLUMN_NAME[:version],
91 - hidden: true  
92 - },  
93 - operating_system: {  
94 - label: DynamicTableHelper::LABEL_TEXT[:operating_system],  
95 - value: database_data[:operating_system],  
96 - name: COLLUMN_NAME[:operating_system], 91 + hidden: true,
97 delete: true 92 delete: true
98 } 93 }
99 } 94 }
lib/dynamic_table_helper.rb
  Diff comments   View file @418a9a7
@@ -13,13 +13,13 @@ module DynamicTableHelper @@ -13,13 +13,13 @@ module DynamicTableHelper
13 :license => _("License") 13 :license => _("License")
14 } 14 }
15 15
16 - def self.table_html_structure data 16 + def self.table_html_structure data={}
17 Proc::new do 17 Proc::new do
18 content_tag :table , DynamicTableHelper.generate_table_lines(data), :class => "dynamic-table" 18 content_tag :table , DynamicTableHelper.generate_table_lines(data), :class => "dynamic-table"
19 end 19 end
20 end 20 end
21 21
22 - def self.generate_table_lines data 22 + def self.generate_table_lines data={}
23 @model = data[:model_name].to_css_class 23 @model = data[:model_name].to_css_class
24 @field_name = data[:field_name] 24 @field_name = data[:field_name]
25 @value = data[:name][:value] 25 @value = data[:name][:value]
@@ -28,23 +28,25 @@ module DynamicTableHelper @@ -28,23 +28,25 @@ module DynamicTableHelper
28 [ 28 [
29 self.table_line(data[:name]), 29 self.table_line(data[:name]),
30 self.table_line(data[:version]), 30 self.table_line(data[:version]),
31 - self.table_line(data[:operating_system]||data[:license]) 31 + self.table_line(data[:license])
32 ].join() 32 ].join()
33 end 33 end
34 34
35 - def self.table_line row_data  
36 - content_tag :tr, [  
37 - self.label_collumn(row_data[:label]),  
38 - self.value_collumn(row_data[:value], row_data[:name], row_data[:autocomplete]),  
39 - self.hidden_collumn(row_data[:delete], row_data[:hidden])  
40 - ].join() 35 + def self.table_line row_data={}
  36 + if !row_data.blank?
  37 + content_tag :tr, [
  38 + self.label_collumn(row_data[:label]),
  39 + self.value_collumn(row_data[:value], row_data[:name], row_data[:autocomplete]),
  40 + self.hidden_collumn(row_data[:delete], row_data[:hidden])
  41 + ].join()
  42 + end
41 end 43 end
42 44
43 - def self.label_collumn label 45 + def self.label_collumn label=""
44 content_tag :td, label_tag(label) 46 content_tag :td, label_tag(label)
45 end 47 end
46 48
47 - def self.value_collumn value, name, autocomplete=false 49 + def self.value_collumn value="", name="", autocomplete=false
48 html_options = 50 html_options =
49 if autocomplete 51 if autocomplete
50 { 52 {
@@ -55,7 +57,11 @@ module DynamicTableHelper @@ -55,7 +57,11 @@ module DynamicTableHelper
55 {} 57 {}
56 end 58 end
57 59
58 - content_tag :td, text_field_tag("#{@model}[][#{name}]", value, html_options) 60 + if autocomplete
  61 + content_tag :td, text_field_tag("#{@model}_autocomplete", value, html_options)
  62 + else
  63 + content_tag :td, text_field_tag("#{@model}[][#{name}]", value, html_options)
  64 + end
59 end 65 end
60 66
61 def self.hidden_collumn delete=false, hidden_data=false 67 def self.hidden_collumn delete=false, hidden_data=false
lib/software_database.rb
  Diff comments   View file @418a9a7
@@ -16,7 +16,7 @@ class SoftwareDatabase &lt; ActiveRecord::Base @@ -16,7 +16,7 @@ class SoftwareDatabase &lt; ActiveRecord::Base
16 :too_long => _("Software database is too long (maximum is 20 characters)") 16 :too_long => _("Software database is too long (maximum is 20 characters)")
17 ) 17 )
18 18
19 - validates_presence_of :database_description_id, :version, :operating_system 19 + validates_presence_of :database_description_id, :version
20 validates( 20 validates(
21 :database_description_id, 21 :database_description_id,
22 :numericality => {:greater_than_or_equal_to => 1} 22 :numericality => {:greater_than_or_equal_to => 1}
lib/software_language.rb
  Diff comments   View file @418a9a7
@@ -16,5 +16,5 @@ class SoftwareLanguage &lt; ActiveRecord::Base @@ -16,5 +16,5 @@ class SoftwareLanguage &lt; ActiveRecord::Base
16 :too_long => _("Software language is too long (maximum is 20 characters)") 16 :too_long => _("Software language is too long (maximum is 20 characters)")
17 ) 17 )
18 18
19 - validates_presence_of :version,:programming_language,:operating_system 19 + validates_presence_of :version,:programming_language
20 end 20 end
lib/software_language_helper.rb
  Diff comments   View file @418a9a7
@@ -47,25 +47,15 @@ module SoftwareLanguageHelper @@ -47,25 +47,15 @@ module SoftwareLanguageHelper
47 true 47 true
48 end 48 end
49 49
50 - def self.language_as_tables(list_languages, show_information = false)  
51 - lambdas_list = []  
52 -  
53 - if not show_information  
54 - return language_html_structure(  
55 - {:programming_language_id => "",  
56 - :version => "",  
57 - :operating_system => ""}  
58 - ) if list_languages.nil?  
59 -  
60 - list_languages.each do |language|  
61 - lambdas_list << language_html_structure(language)  
62 - end 50 + def self.language_as_tables(list_languages)
  51 + return language_html_structure(
  52 + {:programming_language_id => "", :version => "", :operating_system => ""}
  53 + ) if list_languages.nil?
63 54
64 - else  
65 - list_languages.each do |language|  
66 - lambdas_list << language_html_show_structure(language)  
67 - end 55 + lambdas_list = []
68 56
  57 + list_languages.each do |language|
  58 + lambdas_list << language_html_structure(language)
69 end 59 end
70 60
71 lambdas_list 61 lambdas_list
@@ -97,12 +87,7 @@ module SoftwareLanguageHelper @@ -97,12 +87,7 @@ module SoftwareLanguageHelper
97 label: DynamicTableHelper::LABEL_TEXT[:version], 87 label: DynamicTableHelper::LABEL_TEXT[:version],
98 value: language_data[:version], 88 value: language_data[:version],
99 name: COLLUMN_NAME[:version], 89 name: COLLUMN_NAME[:version],
100 - hidden: true  
101 - },  
102 - operating_system: {  
103 - label: DynamicTableHelper::LABEL_TEXT[:operating_system],  
104 - value: language_data[:operating_system],  
105 - name: COLLUMN_NAME[:operating_system], 90 + hidden: true,
106 delete: true 91 delete: true
107 } 92 }
108 } 93 }
@@ -110,37 +95,6 @@ module SoftwareLanguageHelper @@ -110,37 +95,6 @@ module SoftwareLanguageHelper
110 DynamicTableHelper.table_html_structure(data) 95 DynamicTableHelper.table_html_structure(data)
111 end 96 end
112 97
113 - def self.language_html_show_structure(language)  
114 - Proc::new do  
115 - content_tag(  
116 - 'table',  
117 - content_tag(  
118 - 'tr',  
119 - content_tag('td', label_tag(_("Language Name: ")))+  
120 - content_tag(  
121 - 'td',  
122 - ProgrammingLanguage.where(  
123 - :id => language[:programming_language_id]  
124 - )[0].name  
125 - )+  
126 - content_tag('td')  
127 - )+  
128 -  
129 - content_tag('tr',  
130 - content_tag('td', label_tag(_("Version")))+  
131 - content_tag('td', language[:version])+  
132 - content_tag('td')  
133 - )+  
134 -  
135 - content_tag('tr',  
136 - content_tag('td', label_tag(_("Operating System")))+  
137 - content_tag('td', language[:operating_system])+  
138 - content_tag('td', "")  
139 - ), :class => 'dynamic-table software-language-table'  
140 - )  
141 - end  
142 - end  
143 -  
144 def self.add_dynamic_table 98 def self.add_dynamic_table
145 language_as_tables(nil).call 99 language_as_tables(nil).call
146 end 100 end