diff options
| author | Vlatka Pavisic | 2017-03-22 14:13:39 +0100 | 
|---|---|---|
| committer | Vlatka Pavisic | 2017-03-22 14:13:39 +0100 | 
| commit | 3c97164c390c3001f656d174b80f8a87d57d60ef (patch) | |
| tree | 5572593d33c57113cb3fd1252ec5eed0a062fbd4 | |
| parent | 840241c12211a5e46e5c38cc2007339d9e00c02f (diff) | |
| download | chouette-core-3c97164c390c3001f656d174b80f8a87d57d60ef.tar.bz2 | |
Refs #2912 : Drop translations cascade
| -rw-r--r-- | app/controllers/referentials_controller.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20170322075010_delete_translations.rb | 5 | ||||
| -rw-r--r-- | db/migrate/20170322131100_delete_translations_cascade.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 2 | ||||
| -rw-r--r-- | spec/features/referentials_spec.rb | 2 | 
5 files changed, 8 insertions, 8 deletions
| diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index ed20a6d17..ce875b6ba 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -1,7 +1,7 @@  class ReferentialsController < BreadcrumbController    defaults :resource_class => Referential    include PolicyChecker -  before_action :check_policy, :only => [:edit, :update] # overrides default +  before_action :check_policy, :only => [:edit, :update, :archive, :unarchive] # overrides default    respond_to :html    respond_to :json, :only => :show diff --git a/db/migrate/20170322075010_delete_translations.rb b/db/migrate/20170322075010_delete_translations.rb deleted file mode 100644 index 76976f6b8..000000000 --- a/db/migrate/20170322075010_delete_translations.rb +++ /dev/null @@ -1,5 +0,0 @@ -class DeleteTranslations < ActiveRecord::Migration -  def change -    drop_table :translations -  end -end diff --git a/db/migrate/20170322131100_delete_translations_cascade.rb b/db/migrate/20170322131100_delete_translations_cascade.rb new file mode 100644 index 000000000..9b802b6ff --- /dev/null +++ b/db/migrate/20170322131100_delete_translations_cascade.rb @@ -0,0 +1,5 @@ +class DeleteTranslationsCascade < ActiveRecord::Migration +  def change +    drop_table :translations, force: :cascade +  end +end diff --git a/db/schema.rb b/db/schema.rb index 027079611..afa8d08b9 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: 20170322075010) do +ActiveRecord::Schema.define(version: 20170322131100) do    # These are extensions that must be enabled in order to support this database    enable_extension "plpgsql" diff --git a/spec/features/referentials_spec.rb b/spec/features/referentials_spec.rb index 39c5adcd5..7e22c6f17 100644 --- a/spec/features/referentials_spec.rb +++ b/spec/features/referentials_spec.rb @@ -50,7 +50,7 @@ describe "Referentials", :type => :feature do    end    describe "destroy" do -    let(:referential) {  create(:referential, :organisation => @user.organisation) } +    let(:referential) { create(:referential, :organisation => @user.organisation) }      it "should remove referential" do        visit referential_path(referential) | 
