trusty-cms 3.1.8 → 3.1.9

data/db/migrate/006_remove_user_login_index.rb

@@ -0,0 +1,8 @@
+class RemoveUserLoginIndex < ActiveRecord::Migration[5.1]
+  def self.up
+    remove_index "users", :name => "login"
+  end
+  
+  def self.down
+  end
+end

data/db/migrate/010_create_sites.rb

@@ -0,0 +1,13 @@
+class CreateSites < ActiveRecord::Migration[5.1]
+  def self.up
+    create_table :sites do |t|
+      t.column :name, :string
+      t.column :domain, :string
+      t.column :homepage_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table :sites
+  end
+end

data/db/migrate/011_add_order_to_sites.rb

@@ -0,0 +1,9 @@
+class AddOrderToSites < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :sites, :position, :integer, :default => 0
+  end
+  
+  def self.down
+    remove_column :sites, :position
+  end
+end

data/db/migrate/022_add_admin_fields_to_sites.rb

@@ -0,0 +1,17 @@
+class AddAdminFieldsToSites < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :sites, :created_by_id, :integer
+    add_column :sites, :created_at, :datetime
+    add_column :sites, :updated_by_id, :integer
+    add_column :sites, :updated_at, :datetime
+    add_column :sites, :subtitle, :string
+  end
+  
+  def self.down
+    remove_column :sites, :created_by_id
+    remove_column :sites, :created_at
+    remove_column :sites, :udpated_by_id
+    remove_column :sites, :updated_at
+    remove_column :sites, :subtitle
+  end
+end

data/db/migrate/023_add_sites.rb

@@ -0,0 +1,13 @@
+class AddSites < ActiveRecord::Migration[5.1]
+  def self.up
+    [:layouts, :snippets, :users].each do |table|
+      add_column table, :site_id, :integer
+    end
+  end
+
+  def self.down
+    [:layouts, :snippets, :users].each do |table|
+      add_column table, :site_id, :integer
+    end
+  end
+end

data/db/migrate/024_site_abbreviation.rb

@@ -0,0 +1,9 @@
+class SiteAbbreviation < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :sites, :abbreviation, :string
+  end
+
+  def self.down
+    remove_column :sites, :abbreviation
+  end
+end

data/db/migrate/025_recreate_non_unique_index_on_snippets_name.rb

@@ -0,0 +1,11 @@
+class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration[5.1]
+  def self.up
+    remove_index :snippets, :name => "name"
+    add_index :snippets, [:name, :site_id ], :name => "name_site_id", :unique => true
+  end
+
+  def self.down
+    remove_index :snippets, :name => "name_site_id"
+    add_index :snippets, :name, :name => "name", :unique => true
+  end
+end

data/db/migrate/026_add_site_id_to_pages.rb

@@ -0,0 +1,24 @@
+class AddSiteIdToPages < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :pages, :site_id, :integer, required: true
+    add_index :pages, :site_id
+
+    Site.all.each do |site|
+      homepage = site.homepage
+      homepage.site_id = site.id
+      homepage.save
+      unless homepage.id == Page.root.id
+        homepage.descendants.each do |page|
+          page.site_id = site.id
+          page.save
+        end
+      end
+    end
+
+  end
+
+  def self.down
+    remove_index :pages, site_id
+    remove_column :pages, :site_id
+  end
+end

data/db/migrate/027_add_base_domain_to_sites.rb

@@ -0,0 +1,9 @@
+class AddBaseDomainToSites < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :sites, :base_domain, :string
+  end
+  
+  def self.down
+    remove_column :sites, :base_domain
+  end
+end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.1.8'
+    VERSION = '3.1.9'
   end
 end

data/spec/dummy/db/schema.rb

@@ -33,6 +33,7 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.integer "updated_by_id"
     t.string "content_type", limit: 40
     t.integer "lock_version", default: 0
+    t.integer "site_id"
   end
 
   create_table "page_fields", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
@@ -65,10 +66,12 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.integer "updated_by_id"
     t.boolean "virtual", default: false, null: false
     t.integer "lock_version", default: 0
+    t.integer "site_id"
     t.text "allowed_children_cache"
     t.integer "position"
     t.index ["class_name"], name: "pages_class_name"
     t.index ["parent_id"], name: "pages_parent_id"
+    t.index ["site_id"], name: "index_pages_on_site_id"
     t.index ["slug", "parent_id"], name: "pages_child_slug"
     t.index ["virtual", "status_id"], name: "pages_published"
   end
@@ -81,6 +84,20 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
+  create_table "sites", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.string "domain"
+    t.integer "homepage_id"
+    t.integer "position", default: 0
+    t.integer "created_by_id"
+    t.datetime "created_at"
+    t.integer "updated_by_id"
+    t.datetime "updated_at"
+    t.string "subtitle"
+    t.string "abbreviation"
+    t.string "base_domain"
+  end
+
   create_table "snippets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
     t.string "name", limit: 100, default: "", null: false
     t.string "filter_id", limit: 25
@@ -90,7 +107,8 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.integer "lock_version", default: 0
-    t.index ["name"], name: "name", unique: true
+    t.integer "site_id"
+    t.index ["name", "site_id"], name: "name_site_id", unique: true
   end
 
   create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
@@ -108,10 +126,10 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.text "notes"
     t.integer "lock_version", default: 0
     t.string "session_token"
+    t.integer "site_id"
     t.string "locale"
     t.string "password_reset_token"
     t.datetime "password_reset_sent_at"
-    t.index ["login"], name: "login", unique: true
   end
 
 end