app/controllers/cms/fortress/roles_controller.rb in cms-fortress-0.2.0 vs app/controllers/cms/fortress/roles_controller.rb in cms-fortress-1.0.0

@@ -1,6 +1,6 @@
-class Cms::Fortress::RolesController < CmsAdmin::BaseController
+class Cms::Fortress::RolesController < Admin::Cms::BaseController
 
   # GET /cms/fortress/roles
   # GET /cms/fortress/roles.json
   def index
     @cms_fortress_roles = Cms::Fortress::Role.all
@@ -39,14 +39,16 @@
   end
 
   # POST /cms/fortress/roles
   # POST /cms/fortress/roles.json
   def create
-    @cms_fortress_role = Cms::Fortress::Role.new(params[:cms_fortress_role])
+    @cms_fortress_role = Cms::Fortress::Role.new(role_params)
+    @cms_fortress_role.load_defaults
 
     respond_to do |format|
       if @cms_fortress_role.save
+
         format.html { redirect_to @cms_fortress_role, notice: 'Role was successfully created.' }
         format.json { render json: @cms_fortress_role, status: :created, location: @cms_fortress_role }
       else
         format.html { render action: "new" }
         format.json { render json: @cms_fortress_role.errors, status: :unprocessable_entity }
@@ -58,11 +60,11 @@
   # PUT /cms/fortress/roles/1.json
   def update
     @cms_fortress_role = Cms::Fortress::Role.find(params[:id])
 
     respond_to do |format|
-      if @cms_fortress_role.update_attributes(params[:cms_fortress_role])
+      if @cms_fortress_role.update_attributes(role_params)
         format.html { redirect_to cms_fortress_roles_path, notice: 'Role was successfully updated.' }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
         format.json { render json: @cms_fortress_role.errors, status: :unprocessable_entity }
@@ -78,7 +80,13 @@
 
     respond_to do |format|
       format.html { redirect_to cms_fortress_roles_url }
       format.json { head :no_content }
     end
+  end
+
+  private
+
+  def role_params
+    params.require(:cms_fortress_role).permit(:name, :description)
   end
 end