Download as
Browse Code »

Commit 19330e123c400387596877e0fc0330dbf0754753

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

Call html_structure as callback 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 3 changed files with 21 additions and 20 deletions   Show diff stats
lib/database_helper.rb
  Diff comments   View file @19330e1
... ... @@ -43,17 +43,13 @@ class DatabaseHelper &lt; DynamicTableHelper
43 43 end
44 44  
45 45 def self.database_as_tables(list_databases, disabled=false)
46   - return database_html_structure(
47   - {:database_description_id => "", :version => ""}, disabled
48   - ) if list_databases.nil?
49   -
50   - lambdas_list = []
51   -
52   - list_databases.each do |database|
53   - lambdas_list << database_html_structure(database, disabled)
  46 + model_list = if list_databases.blank?
  47 + [{:database_description_id => "", :version => ""}]
  48 + else
  49 + list_databases
54 50 end
55 51  
56   - lambdas_list
  52 + models_as_tables model_list, "database_html_structure", disabled
57 53 end
58 54  
59 55 def self.database_html_structure(database_data, disabled)
... ... @@ -83,6 +79,6 @@ class DatabaseHelper &lt; DynamicTableHelper
83 79 end
84 80  
85 81 def self.add_dynamic_table
86   - database_as_tables(nil).call
  82 + database_as_tables(nil).first.call
87 83 end
88 84 end
89 85 \ No newline at end of file
... ...
lib/dynamic_table_helper.rb
  Diff comments   View file @19330e1
... ... @@ -133,4 +133,12 @@ class DynamicTableHelper
133 133  
134 134 row_data
135 135 end
  136 +
  137 + def self.models_as_tables models, callback, disabled=false
  138 + lambdas_list = []
  139 +
  140 + models.map do |model|
  141 + send(callback, model, disabled)
  142 + end
  143 + end
136 144 end
137 145 \ No newline at end of file
... ...
lib/software_language_helper.rb
  Diff comments   View file @19330e1
... ... @@ -42,16 +42,13 @@ class SoftwareLanguageHelper &lt; DynamicTableHelper
42 42 end
43 43  
44 44 def self.language_as_tables(list_languages, disabled=false)
45   - return language_html_structure(
46   - {:programming_language_id => "", :version => ""}, disabled
47   - ) if list_languages.nil?
48   -
49   - lambdas_list = []
50   -
51   - list_languages.each do |language|
52   - lambdas_list << language_html_structure(language, disabled)
  45 + model_list = if list_languages.blank?
  46 + [{:programming_language_id => "", :version => ""}]
  47 + else
  48 + list_languages
53 49 end
54   - lambdas_list
  50 +
  51 + models_as_tables model_list, "language_html_structure", disabled
55 52 end
56 53  
57 54 def self.language_html_structure(language_data, disabled)
... ... @@ -81,6 +78,6 @@ class SoftwareLanguageHelper &lt; DynamicTableHelper
81 78 end
82 79  
83 80 def self.add_dynamic_table
84   - language_as_tables(nil).call
  81 + language_as_tables(nil).first.call
85 82 end
86 83 end
... ...