From 418a9a7c91586624e47dec94a7ba1b3f32c4491d Mon Sep 17 00:00:00 2001 From: Fabio Teixeira Date: Tue, 16 Dec 2014 16:21:38 -0200 Subject: [PATCH] Remove row operating_system from software_database and software_language --- lib/database_helper.rb | 7 +------ lib/dynamic_table_helper.rb | 30 ++++++++++++++++++------------ lib/software_database.rb | 2 +- lib/software_language.rb | 2 +- lib/software_language_helper.rb | 62 ++++++++------------------------------------------------------ 5 files changed, 29 insertions(+), 74 deletions(-) diff --git a/lib/database_helper.rb b/lib/database_helper.rb index 53a7473..020421d 100644 --- a/lib/database_helper.rb +++ b/lib/database_helper.rb @@ -88,12 +88,7 @@ module DatabaseHelper label: DynamicTableHelper::LABEL_TEXT[:version], value: database_data[:version], name: COLLUMN_NAME[:version], - hidden: true - }, - operating_system: { - label: DynamicTableHelper::LABEL_TEXT[:operating_system], - value: database_data[:operating_system], - name: COLLUMN_NAME[:operating_system], + hidden: true, delete: true } } diff --git a/lib/dynamic_table_helper.rb b/lib/dynamic_table_helper.rb index c6c4551..a2a43f9 100644 --- a/lib/dynamic_table_helper.rb +++ b/lib/dynamic_table_helper.rb @@ -13,13 +13,13 @@ module DynamicTableHelper :license => _("License") } - def self.table_html_structure data + def self.table_html_structure data={} Proc::new do content_tag :table , DynamicTableHelper.generate_table_lines(data), :class => "dynamic-table" end end - def self.generate_table_lines data + def self.generate_table_lines data={} @model = data[:model_name].to_css_class @field_name = data[:field_name] @value = data[:name][:value] @@ -28,23 +28,25 @@ module DynamicTableHelper [ self.table_line(data[:name]), self.table_line(data[:version]), - self.table_line(data[:operating_system]||data[:license]) + self.table_line(data[:license]) ].join() end - def self.table_line row_data - content_tag :tr, [ - self.label_collumn(row_data[:label]), - self.value_collumn(row_data[:value], row_data[:name], row_data[:autocomplete]), - self.hidden_collumn(row_data[:delete], row_data[:hidden]) - ].join() + def self.table_line row_data={} + if !row_data.blank? + content_tag :tr, [ + self.label_collumn(row_data[:label]), + self.value_collumn(row_data[:value], row_data[:name], row_data[:autocomplete]), + self.hidden_collumn(row_data[:delete], row_data[:hidden]) + ].join() + end end - def self.label_collumn label + def self.label_collumn label="" content_tag :td, label_tag(label) end - def self.value_collumn value, name, autocomplete=false + def self.value_collumn value="", name="", autocomplete=false html_options = if autocomplete { @@ -55,7 +57,11 @@ module DynamicTableHelper {} end - content_tag :td, text_field_tag("#{@model}[][#{name}]", value, html_options) + if autocomplete + content_tag :td, text_field_tag("#{@model}_autocomplete", value, html_options) + else + content_tag :td, text_field_tag("#{@model}[][#{name}]", value, html_options) + end end def self.hidden_collumn delete=false, hidden_data=false diff --git a/lib/software_database.rb b/lib/software_database.rb index ac581c8..75c983e 100644 --- a/lib/software_database.rb +++ b/lib/software_database.rb @@ -16,7 +16,7 @@ class SoftwareDatabase < ActiveRecord::Base :too_long => _("Software database is too long (maximum is 20 characters)") ) - validates_presence_of :database_description_id, :version, :operating_system + validates_presence_of :database_description_id, :version validates( :database_description_id, :numericality => {:greater_than_or_equal_to => 1} diff --git a/lib/software_language.rb b/lib/software_language.rb index 1c99b8b..faa011c 100644 --- a/lib/software_language.rb +++ b/lib/software_language.rb @@ -16,5 +16,5 @@ class SoftwareLanguage < ActiveRecord::Base :too_long => _("Software language is too long (maximum is 20 characters)") ) - validates_presence_of :version,:programming_language,:operating_system + validates_presence_of :version,:programming_language end diff --git a/lib/software_language_helper.rb b/lib/software_language_helper.rb index e9303bd..74e9a0c 100644 --- a/lib/software_language_helper.rb +++ b/lib/software_language_helper.rb @@ -47,25 +47,15 @@ module SoftwareLanguageHelper true end - def self.language_as_tables(list_languages, show_information = false) - lambdas_list = [] - - if not show_information - return language_html_structure( - {:programming_language_id => "", - :version => "", - :operating_system => ""} - ) if list_languages.nil? - - list_languages.each do |language| - lambdas_list << language_html_structure(language) - end + def self.language_as_tables(list_languages) + return language_html_structure( + {:programming_language_id => "", :version => "", :operating_system => ""} + ) if list_languages.nil? - else - list_languages.each do |language| - lambdas_list << language_html_show_structure(language) - end + lambdas_list = [] + list_languages.each do |language| + lambdas_list << language_html_structure(language) end lambdas_list @@ -97,12 +87,7 @@ module SoftwareLanguageHelper label: DynamicTableHelper::LABEL_TEXT[:version], value: language_data[:version], name: COLLUMN_NAME[:version], - hidden: true - }, - operating_system: { - label: DynamicTableHelper::LABEL_TEXT[:operating_system], - value: language_data[:operating_system], - name: COLLUMN_NAME[:operating_system], + hidden: true, delete: true } } @@ -110,37 +95,6 @@ module SoftwareLanguageHelper DynamicTableHelper.table_html_structure(data) end - def self.language_html_show_structure(language) - Proc::new do - content_tag( - 'table', - content_tag( - 'tr', - content_tag('td', label_tag(_("Language Name: ")))+ - content_tag( - 'td', - ProgrammingLanguage.where( - :id => language[:programming_language_id] - )[0].name - )+ - content_tag('td') - )+ - - content_tag('tr', - content_tag('td', label_tag(_("Version")))+ - content_tag('td', language[:version])+ - content_tag('td') - )+ - - content_tag('tr', - content_tag('td', label_tag(_("Operating System")))+ - content_tag('td', language[:operating_system])+ - content_tag('td', "") - ), :class => 'dynamic-table software-language-table' - ) - end - end - def self.add_dynamic_table language_as_tables(nil).call end -- libgit2 0.21.2