caboose-cms 0.5.186 → 0.5.187

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdmNDFiZTE2ZmE1OGE1N2IyYTVkZWFiNzE2OTUwNDZmZGUwODA3Yw==
+    YjZkZTQxZjA1MDMyYjdjY2Y1MGVjYjU2ZGY5ZjdjNjM4ODAxZWZjOQ==
   data.tar.gz: !binary |-
-    MjkxNmViODAzMWM1ZmYzYWFlODcxNTA1ZTA4ZTc3YjNkMWI2ZjljNw==
+    MzkzOWYyOWEwMmRlNzRhOTJiMDU1MDg2ODZjZmM4ZTAwYzY0OGI3Zg==
 SHA512:
   metadata.gz: !binary |-
-    ZTJmZGZmY2NlMTlhNjJjMTgxMjczZmFkMTU0MjAxYjdiZjFhMGMyOTk1MmMy
-    NTM2M2ExMzc0MmY2YzE4NWRhN2EyMjkxNDNjMGM2Y2Q2MWU3NjVjNjI0ZGM1
-    MTFkYjA2NDNjOTA0Y2ZmYWM0NTgwYjViYjQxMWMzODk3Y2E0MTM=
+    MmVhNThmZDcxYTE3NTFkNGMxOTE0NTNlYmRhZWM1YTJlZWI2ZTQ5OTBhYTUw
+    MTlkY2M4MWUwNGJiNzFlNzc4MzdlM2MwMDM0Zjk5YWNlMGMwNDQyYjIyZTM4
+    YWUxMDA0Yzk3NjQ1ZDAyZWJlOGQ3YTYyODQwOWVlN2JjODEyM2U=
   data.tar.gz: !binary |-
-    YzZlZmU0OGEwNWJmMzgxNzc5MWVkOGQyODUxNWQ0YTI3ZjU1ZDhjODViMTYw
-    OGUyNGUzYmJjMDY0OGQ0MTQ0Y2QwNmUxMjVhZTU4NGQ3NmQxNWE5NTI0MDJj
-    Y2RjNmE2MjI3NjliOWQxMWY4ZWI3YWVhMWEwNjBjMWUwZDU4ZDU=
+    YTAwNGJmZTI2N2U5ZWIxYjk4ZjlkYmRjN2I0MTAyYzU4YjkyMjZkYTU2YmNi
+    YTIzMmFjYmNlOGNiYTE3YWY4NDZiMjBjOWQ3ZjVjYjc2Y2IyMzc4OThlYzkx
+    ZTk1YmEyNTI2ZmIxZjc2NDE5M2MwOTZlMDYwZGU2YjMzMTI2NWM=

data/app/controllers/caboose/sites_controller.rb

@@ -51,14 +51,13 @@ module Caboose
       
       # Create an admin user for the account
       if !User.where(:username => 'admin', :site_id => @site.id).exists?
-        admin_user = User.create(:username => 'admin', :site_id => @site.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose'))
-        admin_role = Role.where(:name => 'Admin').first
-        if admin_role
-          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)
-        else
-          Caboose.log("Error: no admin role exists.")
+        admin_user = User.create(:username => 'admin', :email => 'admin@nine.is', :site_id => @site.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose'))        
+        admin_role = Role.where(:name => 'Admin').first        
+        if admin_user && admin_role                      
+          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)          
         end
       end
+      
     end
     
     # GET /admin/sites/:id/block-types
@@ -101,13 +100,11 @@ module Caboose
       end
       
       # Create an admin user for the account
-      if !User.where(:username => 'admin', :site_id => site.id).exists?
-        admin_user = User.create(:username => 'admin', :site_id => site.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose'))
+      if !User.where(:username => 'admin', :site_id => site.id).exists?        
+        admin_user = User.create(:username => 'admin', :email => 'admin@nine.is', :site_id => site.id, :password => Digest::SHA1.hexdigest(Caboose::salt + 'caboose'))
         admin_role = Role.where(:name => 'Admin').first
         if admin_role
-          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)
-        else
-          Caboose.log("Error: no admin role exists.")
+          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)        
         end
       end
       

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.186'
+  VERSION = '0.5.187'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.186
+  version: 0.5.187
 platform: ruby
 authors:
 - William Barry