From cada43eb72450052c79f6904a6f0f543116104f0 Mon Sep 17 00:00:00 2001 From: Harrison Hassig Date: Mon, 9 Sep 2024 08:48:33 +0200 Subject: [PATCH] Bump decidim-decidim_awesome from 0.11.0 to 0.11.1 (#7) --- Gemfile | 2 +- Gemfile.lock | 16 ++++------ ..._private_fields.decidim_decidim_awesome.rb | 30 +++++++++++++++++++ ...ate_fields_date.decidim_decidim_awesome.rb | 21 +++++++++++++ db/schema.rb | 7 +++-- 5 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20240906193552_add_decidim_awesome_proposal_private_fields.decidim_decidim_awesome.rb create mode 100644 db/migrate/20240906193553_add_decidim_awesome_proposal_private_fields_date.decidim_decidim_awesome.rb diff --git a/Gemfile b/Gemfile index 98dd2ca..ddb334c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ ruby RUBY_VERSION gem "decidim", DECIDIM_VERSION -gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "develop" +gem "decidim-decidim_awesome" gem "decidim-social_crowdfunding", git: "https://github.com/Platoniq/decidim-module-social_crowdfunding", branch: "main" gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "main" diff --git a/Gemfile.lock b/Gemfile.lock index ee85d3b..dfac0e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,17 +7,6 @@ GIT decidim-admin (>= 0.28.0, < 0.29) decidim-core (>= 0.28.0, < 0.29) -GIT - remote: https://github.com/decidim-ice/decidim-module-decidim_awesome - revision: b2800256f5e147452438686029b3990c89fb21be - branch: develop - specs: - decidim-decidim_awesome (0.11.0) - decidim-admin (>= 0.28.0, < 0.29) - decidim-core (>= 0.28.0, < 0.29) - deface (>= 1.5) - sassc (~> 2.3) - GIT remote: https://github.com/mainio/decidim-module-term_customizer revision: 9133eea57ebfc4164b640efd1ac6b9ca1628c793 @@ -304,6 +293,11 @@ GEM decidim-debates (0.28.2) decidim-comments (= 0.28.2) decidim-core (= 0.28.2) + decidim-decidim_awesome (0.11.1) + decidim-admin (>= 0.28.0, < 0.29) + decidim-core (>= 0.28.0, < 0.29) + deface (>= 1.5) + sassc (~> 2.3) decidim-dev (0.28.2) bullet (~> 7.0) byebug (~> 11.0) diff --git a/db/migrate/20240906193552_add_decidim_awesome_proposal_private_fields.decidim_decidim_awesome.rb b/db/migrate/20240906193552_add_decidim_awesome_proposal_private_fields.decidim_decidim_awesome.rb new file mode 100644 index 0000000..8ebac80 --- /dev/null +++ b/db/migrate/20240906193552_add_decidim_awesome_proposal_private_fields.decidim_decidim_awesome.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true +# This migration comes from decidim_decidim_awesome (originally 20240531224204) + +class AddDecidimAwesomeProposalPrivateFields < ActiveRecord::Migration[6.0] + class ProposalExtraField < ApplicationRecord + self.table_name = :decidim_awesome_proposal_extra_fields + end + + def change + add_column :decidim_awesome_proposal_extra_fields, :private_body, :string + add_column :decidim_awesome_proposal_extra_fields, :decidim_proposal_type, :string + reversible do |direction| + direction.up do + execute <<~SQL.squish + UPDATE decidim_awesome_proposal_extra_fields + SET decidim_proposal_type = 'Decidim::Proposals::Proposal' + SQL + end + end + + remove_index :decidim_awesome_proposal_extra_fields, name: "decidim_awesome_extra_fields_on_proposal" + add_index :decidim_awesome_proposal_extra_fields, + [:decidim_proposal_id, :decidim_proposal_type], + name: "index_decidim_awesome_proposal_extra_fields_on_decidim_proposal" + + change_column_null :decidim_awesome_proposal_extra_fields, :decidim_proposal_id, false + change_column_null :decidim_awesome_proposal_extra_fields, :decidim_proposal_type, false + ProposalExtraField.reset_column_information + end +end diff --git a/db/migrate/20240906193553_add_decidim_awesome_proposal_private_fields_date.decidim_decidim_awesome.rb b/db/migrate/20240906193553_add_decidim_awesome_proposal_private_fields_date.decidim_decidim_awesome.rb new file mode 100644 index 0000000..7d6b053 --- /dev/null +++ b/db/migrate/20240906193553_add_decidim_awesome_proposal_private_fields_date.decidim_decidim_awesome.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true +# This migration comes from decidim_decidim_awesome (originally 20240729164227) + +class AddDecidimAwesomeProposalPrivateFieldsDate < ActiveRecord::Migration[6.1] + class ProposalExtraField < ApplicationRecord + self.table_name = :decidim_awesome_proposal_extra_fields + end + + def change + add_column :decidim_awesome_proposal_extra_fields, :private_body_updated_at, :datetime + + reversible do |direction| + direction.up do + execute <<~SQL.squish + UPDATE decidim_awesome_proposal_extra_fields + SET private_body_updated_at = updated_at + SQL + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 093c512..459f45e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_06_24_113132) do +ActiveRecord::Schema.define(version: 2024_09_06_193553) do # These are extensions that must be enabled in order to support this database enable_extension "ltree" @@ -347,7 +347,10 @@ t.integer "weight_total", default: 0 t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index ["decidim_proposal_id"], name: "decidim_awesome_extra_fields_on_proposal" + t.string "private_body" + t.string "decidim_proposal_type", null: false + t.datetime "private_body_updated_at" + t.index ["decidim_proposal_id", "decidim_proposal_type"], name: "index_decidim_awesome_proposal_extra_fields_on_decidim_proposal" end create_table "decidim_awesome_vote_weights", force: :cascade do |t|