trusty-cms 3.9.3 → 3.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5279c4c1c8f109c82909a9114c87e85bb1b7ae9384b360b4a7d1b2b7a6dc9d90
-  data.tar.gz: e93cbf189eea0eacaa1f7f038f8aa24fbaa34f1ea49f2bc12cd5a71174b3f72f
+  metadata.gz: b321f2fd71bed76d9aae8c64c4b9452b12a6170c4eafeac1241399a528cefac5
+  data.tar.gz: 2916e6d45a09f4b16fa58f89004ec34df195a4698eaf970cec3e70e1b53c086c
 SHA512:
-  metadata.gz: 8035bccc58e20699eaa2f81fce995c20eadd6fbed85a426f81fffcba77cc98a70b5e7dde945f15cfe306cf0570bb83e12a3618012b064beaa019c72f123aaf7c
-  data.tar.gz: 644722ff7335dcca0eaf60ed97f4f8288bb199e51bdbd38053131a75fff997802ddd174465256b7c024d0fa102be89870bd7ae083bf0beb71b216d18a42f36e7
+  metadata.gz: 42e8ab55f6290273aabe879864ceddf48e67e5fb162c6d3bd3129ac5f8f2dee8ee1e6a03e3c7b9a6a6353d99130580a792c56d5128b34a47e7b61d98756e676b
+  data.tar.gz: 19675f865bd59f10cbdd5afebf8d814c79904b7308a8c7f2e0a5f8df6c416e1664a22b3533169a052634481957ff7ea088c0f094c8742e35dbf56756ca8ebbff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.9.3)
+    trusty-cms (3.9.4)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)

data/lib/tasks/upgrade_to_devise.rake

@@ -8,8 +8,8 @@ namespace :import do
     password = CHARS.sort_by { rand }.join[0...15]
 
     LegacyUser.all.each do |legacy|
-      u = User.new(
-        email: legacy.email,
+      u = User.find_or_create_by(email: legacy.email)
+      u.update_attributes(
         first_name: legacy.name.split(' ')[0],
         last_name: legacy.name.split(' ')[1],
         password: password,
@@ -17,9 +17,9 @@ namespace :import do
         admin: legacy.admin,
         designer: legacy.designer,
         content_editor: legacy.content_editor,
-        notes: legacy.notes
+        notes: legacy.notes,
+        site_id: legacy.site_id
       )
-      u.save!
     end
   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.9.3'
+    VERSION = '3.9.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.9.4
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list