Skip to content
This repository has been archived by the owner on Oct 11, 2022. It is now read-only.

Review app for feature/edit-initiative-as-promoter by edgarlatorre #238

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "develop" }
DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "feature/edit-initiative-as-promoter" }

gem "decidim", DECIDIM_VERSION
gem "decidim-conferences", DECIDIM_VERSION
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/decidim/decidim
revision: c8eb9b3b1d3442f06b9f90d766b82ff13c88223a
branch: develop
revision: a4141e7c02ffca7f4df2853542b6b35eb567575c
branch: feature/edit-initiative-as-promoter
specs:
decidim (0.24.0.dev)
decidim-accountability (= 0.24.0.dev)
Expand Down Expand Up @@ -815,7 +815,7 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webmock (3.9.4)
webmock (3.9.5)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand Down
13 changes: 13 additions & 0 deletions db/migrate/20201111144735_update_smtp_from_label.decidim_system.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# frozen_string_literal: true
# This migration comes from decidim_system (originally 20201013132945)

class UpdateSmtpFromLabel < ActiveRecord::Migration[5.2]
def change
Decidim::Organization.all.each do |org|
if org.smtp_settings[:from_email].blank?
org.smtp_settings[:from_email] = org.smtp_settings[:from]
org.save!
end
end
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# frozen_string_literal: true
# This migration comes from decidim_meetings (originally 20201016112641)

class AddRegistrationTypeAndUrlToMeetings < ActiveRecord::Migration[5.2]
class Meetings < ApplicationRecord
self.table_name = :decidim_meetings_meetings
include Decidim::HasComponent
end

def change
add_column :decidim_meetings_meetings, :registration_type, :string, null: false, default: "registration_disabled"
add_column :decidim_meetings_meetings, :registration_url, :string

Meetings.reset_column_information
Meetings.find_each do |meeting|
meeting.registration_type = "on_this_platform" if meeting.decidim_author_type == "Decidim::Organization"
meeting.save!
end
end
end
4 changes: 3 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2020_11_02_051533) do
ActiveRecord::Schema.define(version: 2020_11_11_144736) do

# These are extensions that must be enabled in order to support this database
enable_extension "ltree"
Expand Down Expand Up @@ -1063,6 +1063,8 @@
t.integer "comments_count", default: 0, null: false
t.string "online_meeting_url"
t.string "type_of_meeting", default: "in_person"
t.string "registration_type", default: "registration_disabled", null: false
t.string "registration_url"
t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_meetings_meetings_on_author"
t.index ["decidim_author_id"], name: "index_decidim_meetings_meetings_on_decidim_author_id"
t.index ["decidim_component_id"], name: "index_decidim_meetings_meetings_on_decidim_component_id"
Expand Down