Commit 19330e123c400387596877e0fc0330dbf0754753
Committed by
David Silva
David Silva
1 parent
88f89eff
Exists in
master
and in
5 other branches
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
| @@ -43,17 +43,13 @@ class DatabaseHelper < DynamicTableHelper | @@ -43,17 +43,13 @@ class DatabaseHelper < DynamicTableHelper | ||
| 43 | end | 43 | end |
| 44 | 44 | ||
| 45 | def self.database_as_tables(list_databases, disabled=false) | 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 | end | 50 | end |
| 55 | 51 | ||
| 56 | - lambdas_list | 52 | + models_as_tables model_list, "database_html_structure", disabled |
| 57 | end | 53 | end |
| 58 | 54 | ||
| 59 | def self.database_html_structure(database_data, disabled) | 55 | def self.database_html_structure(database_data, disabled) |
| @@ -83,6 +79,6 @@ class DatabaseHelper < DynamicTableHelper | @@ -83,6 +79,6 @@ class DatabaseHelper < DynamicTableHelper | ||
| 83 | end | 79 | end |
| 84 | 80 | ||
| 85 | def self.add_dynamic_table | 81 | def self.add_dynamic_table |
| 86 | - database_as_tables(nil).call | 82 | + database_as_tables(nil).first.call |
| 87 | end | 83 | end |
| 88 | end | 84 | end |
| 89 | \ No newline at end of file | 85 | \ No newline at end of file |
lib/dynamic_table_helper.rb
| @@ -133,4 +133,12 @@ class DynamicTableHelper | @@ -133,4 +133,12 @@ class DynamicTableHelper | ||
| 133 | 133 | ||
| 134 | row_data | 134 | row_data |
| 135 | end | 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 | end | 144 | end |
| 137 | \ No newline at end of file | 145 | \ No newline at end of file |
lib/software_language_helper.rb
| @@ -42,16 +42,13 @@ class SoftwareLanguageHelper < DynamicTableHelper | @@ -42,16 +42,13 @@ class SoftwareLanguageHelper < DynamicTableHelper | ||
| 42 | end | 42 | end |
| 43 | 43 | ||
| 44 | def self.language_as_tables(list_languages, disabled=false) | 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 | end | 49 | end |
| 54 | - lambdas_list | 50 | + |
| 51 | + models_as_tables model_list, "language_html_structure", disabled | ||
| 55 | end | 52 | end |
| 56 | 53 | ||
| 57 | def self.language_html_structure(language_data, disabled) | 54 | def self.language_html_structure(language_data, disabled) |
| @@ -81,6 +78,6 @@ class SoftwareLanguageHelper < DynamicTableHelper | @@ -81,6 +78,6 @@ class SoftwareLanguageHelper < DynamicTableHelper | ||
| 81 | end | 78 | end |
| 82 | 79 | ||
| 83 | def self.add_dynamic_table | 80 | def self.add_dynamic_table |
| 84 | - language_as_tables(nil).call | 81 | + language_as_tables(nil).first.call |
| 85 | end | 82 | end |
| 86 | end | 83 | end |