From 0bb0536903153cddbe43485d8a569bf60049f62e Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Wed, 12 Sep 2018 15:02:25 +0200 Subject: [PATCH] Add short name to FinancialTransactionType --- app/models/financial_transaction_type.rb | 1 + app/views/admin/financial_transaction_types/_form.html.haml | 1 + config/locales/de.yml | 1 + config/locales/en.yml | 1 + ...01000000_add_name_short_to_financial_transaction_type.rb | 6 ++++++ db/schema.rb | 5 ++++- 6 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20171201000000_add_name_short_to_financial_transaction_type.rb diff --git a/app/models/financial_transaction_type.rb b/app/models/financial_transaction_type.rb index 0d68ceb5..3d05c165 100644 --- a/app/models/financial_transaction_type.rb +++ b/app/models/financial_transaction_type.rb @@ -4,6 +4,7 @@ class FinancialTransactionType < ActiveRecord::Base validates :name, presence: true validates_uniqueness_of :name + validates_uniqueness_of :name_short, allow_blank: true, allow_nil: true validates :financial_transaction_class, presence: true before_destroy :restrict_deleting_last_financial_transaction_type diff --git a/app/views/admin/financial_transaction_types/_form.html.haml b/app/views/admin/financial_transaction_types/_form.html.haml index 5abd368b..00b0cfe7 100644 --- a/app/views/admin/financial_transaction_types/_form.html.haml +++ b/app/views/admin/financial_transaction_types/_form.html.haml @@ -5,6 +5,7 @@ .modal-body = f.input :name = f.association :financial_transaction_class, :include_blank => false + = f.input :name_short .modal-footer = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'} = f.submit class: 'btn btn-primary' diff --git a/config/locales/de.yml b/config/locales/de.yml index 5385938f..787346f4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -54,6 +54,7 @@ de: financial_transaction_type: name: Name financial_transaction_class: Finanztransaktionsklasse + name_short: Kurzname group_order: ordergroup: Bestellgruppe price: Bestellsumme diff --git a/config/locales/en.yml b/config/locales/en.yml index bba845a2..dee1237c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -54,6 +54,7 @@ en: financial_transaction_type: name: Name financial_transaction_class: Financial transaction class + name_short: Short Name group_order: ordergroup: Ordergroup price: Order sum diff --git a/db/migrate/20171201000000_add_name_short_to_financial_transaction_type.rb b/db/migrate/20171201000000_add_name_short_to_financial_transaction_type.rb new file mode 100644 index 00000000..653cca34 --- /dev/null +++ b/db/migrate/20171201000000_add_name_short_to_financial_transaction_type.rb @@ -0,0 +1,6 @@ +class AddNameShortToFinancialTransactionType < ActiveRecord::Migration + def change + add_column :financial_transaction_types, :name_short, :string + add_index :financial_transaction_types, :name_short + end +end diff --git a/db/schema.rb b/db/schema.rb index 89866854..ece3a3b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171111000000) do +ActiveRecord::Schema.define(version: 20171201000000) do create_table "article_categories", force: :cascade do |t| t.string "name", limit: 255, default: "", null: false @@ -123,8 +123,11 @@ ActiveRecord::Schema.define(version: 20171111000000) do create_table "financial_transaction_types", force: :cascade do |t| t.string "name", null: false t.integer "financial_transaction_class_id", null: false + t.string "name_short" end + add_index "financial_transaction_types", ["name_short"], name: "index_financial_transaction_types_on_name_short", using: :btree + create_table "financial_transactions", force: :cascade do |t| t.integer "ordergroup_id", limit: 4, default: 0, null: false t.decimal "amount", precision: 8, scale: 2, default: 0, null: false