app/controllers/caboose/sites_controller.rb in caboose-cms-0.5.213 vs app/controllers/caboose/sites_controller.rb in caboose-cms-0.5.214

@@ -45,21 +45,13 @@
       if !@site.is_master
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
       
-      @site = Site.find(params[:id])      
-      
-      # Create an admin user for the account
-      if !User.where(:username => 'admin', :site_id => @site.id).exists?
-        admin_user = User.create(:username => 'admin', :email => '[e-mail]', :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
-      
+      @site = Site.find(params[:id])            
+      @site.init_users_and_roles
+            
     end
     
     # GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
@@ -115,20 +107,11 @@
       else        
         site.save
         StoreConfig.create(:site_id => site.id)
         SmtpConfig.create( :site_id => site.id)
         resp.redirect = "/admin/sites/#{site.id}"
-      end
-      
-      # Create an admin user for the account
-      if !User.where(:username => 'admin', :site_id => site.id).exists?        
-        admin_user = User.create(:username => 'admin', :email => '[e-mail]', :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)        
-        end
-      end
-      
+      end      
+      site.init_users_and_roles            
       render :json => resp
     end
     
     # PUT /admin/sites/:id
     def admin_update