dorsale 3.8.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cd9ee349fdefbfd043c9e528bc07e4f5be23c67
-  data.tar.gz: 1727d591ba6fe8a39da75b00adc47c6d1821c7ae
+  metadata.gz: a17406e315fbb33c48f5604ce568769965b4d3b4
+  data.tar.gz: e41ccc6d00e2e3d627dcc386047d5069fcc83210
 SHA512:
-  metadata.gz: 43382375849075fec61442b60ba94f676da7831588a1c66f4223504d747ff25fdfd3bdd53ad3c0a94521f2e3db1d67507a3d60df7cadfe827bbc32a100f6afba
-  data.tar.gz: 8e0c1a438c2fc23caab0da8dea58d584ffc4a6411fee720fc467806c7b53f313b28c2405d548398648e4ac9e767f2ed03e872e710cf142bf68c4d4c04d4cfd61
+  metadata.gz: 793932d453f32824948498bec31c14274aea9297c906d28d95ab818a81f3141294285098fac81cdd652563ffd0eb8502c247721fb8c44fc47af26d4b74c5318c
+  data.tar.gz: eef15ca0089f73911c95775d081feb8f4b6b7e176f0a5991f99334b0ae9da9c38ca1c48705a6ad8b95b919c3196c8722effa3ec6e13da0d973ecb8525585a261

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.8.1
+
+- Change CV contact type default value
+
 ## 3.8.0
 
 - Move CV comments to events

data/app/models/dorsale/customer_vault/event.rb

@@ -10,8 +10,8 @@ class Dorsale::CustomerVault::Event < ::Dorsale::ApplicationRecord
   validates :person,       presence: true
   validates :date,         presence: true
   validates :text,         presence: true
-  validates :action,       presence: true,    inclusion: {in: proc {ACTIONS} }
-  validates :contact_type, allow_blank: true, inclusion: {in: proc {CONTACT_TYPES} }
+  validates :action,       presence: true, inclusion: {in: proc {ACTIONS} }
+  validates :contact_type, presence: true, inclusion: {in: proc {CONTACT_TYPES} }
 
   default_scope -> {
     all
@@ -23,5 +23,6 @@ class Dorsale::CustomerVault::Event < ::Dorsale::ApplicationRecord
 
   def assign_default_values
     assign_default :date, Date.current
+    assign_default :contact_type, CONTACT_TYPES.first
   end
 end

data/app/views/dorsale/customer_vault/events/_form.html.slim

@@ -17,7 +17,7 @@
           = f.text_field :title, class: "form-control input-sm", placeholder: f.object.t(:title)
 
         .comment-contact_type-field
-          = f.select :contact_type, customer_vault_event_contact_types_for_filter_select, {include_blank: true}, class: "form-control input-sm"
+          = f.select :contact_type, customer_vault_event_contact_types_for_filter_select, {include_blank: false}, class: "form-control input-sm"
 
         .comment-date-field
           = f.text_field :date, class: "form-control input-sm", placeholder: f.object.t(:date)

data/db/migrate/20171024075514_customer_vault_contact_type_default_value.rb

@@ -0,0 +1,5 @@
+class CustomerVaultContactTypeDefaultValue < ActiveRecord::Migration[5.0]
+  def change
+    Dorsale::CustomerVault::Event.where(contact_type: nil).update_all(contact_type: "contact")
+  end
+end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.8.0"
+  VERSION = "3.8.1"
 end

data/spec/models/dorsale/customer_vault/event_spec.rb

@@ -6,12 +6,17 @@ RSpec.describe ::Dorsale::CustomerVault::Event, type: :model do
 
   it { is_expected.to validate_presence_of :person }
   it { is_expected.to validate_presence_of :action }
+  it { is_expected.to validate_presence_of :contact_type }
 
   it { is_expected.to_not validate_presence_of :author }
-  it { is_expected.to_not validate_presence_of :contact_type }
 
   it "should have a valid factory" do
     event = create(:customer_vault_event)
     expect(event).to be_valid
   end
+
+  it "should assign default values" do
+    expect(described_class.new.date).to be_present
+    expect(described_class.new.contact_type).to eq "contact"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -861,6 +861,7 @@ files:
 - db/migrate/20170915070538_dorsale_customer_vault_events_add_text.rb
 - db/migrate/20171023080507_migrate_people_comments_to_events.rb
 - db/migrate/20171023133219_customer_vault_events_add_contact_type.rb
+- db/migrate/20171024075514_customer_vault_contact_type_default_value.rb
 - features/access.feature
 - features/billing_machine_id_cards.feature
 - features/billing_machine_invoices.feature