yamaaki · November 21, 2015 10:22 · Nov 21, 2015 · Nov 21, 2015 · Sep 21, 2015 · Sep 21, 2015
diff --git a/members_controller.rb b/members_controller.rb
@@ -1,4 +1,4 @@
-class Admin::MembersController  < Member::BaseController
+class Admin::MembersController  < Admin::BaseController
   before_filter :authenticate_admin!
   before_action :set_member, only: [:show, :edit, :update, :destroy]
 

diff --git a/members_controller.rb b/members_controller.rb
@@ -1,4 +1,4 @@
-class Admin::MembersController  < Member::ApplicationController
+class Admin::MembersController  < Member::BaseController
   before_filter :authenticate_admin!
   before_action :set_member, only: [:show, :edit, :update, :destroy]
 

diff --git a/members_controller.rb b/members_controller.rb
@@ -33,12 +33,12 @@ def create
 
     respond_to do |format|
       if @member.save
-        redirect_to @member, notice: 'Member was successfully created.'
+        redirect_to [:admin, @member], notice: 'Member was successfully created.'
       else
         render :new
       end
       if @member.save
-        format.html { redirect_to @member, notice: 'Member was successfully created.' }
+        format.html { redirect_to [:admin, @member], notice: 'Member was successfully created.' }
         format.json { render :show, status: :created, location: @member }
       else
         format.html { render :new }
@@ -52,7 +52,7 @@ def create
   def update
     respond_to do |format|
       if @member.update(member_params)
-        format.html { redirect_to @member, notice: 'Member was successfully updated.' }
+        format.html { redirect_to [:admin, @member], notice: 'Member was successfully updated.' }
         format.json { render :show, status: :ok, location: @member }
       else
         format.html { render :edit }
@@ -66,7 +66,7 @@ def update
   def destroy
     @member.destroy
     respond_to do |format|
-      format.html { redirect_to members_url, notice: 'Member was successfully destroyed.' }
+      format.html { redirect_to admin_members_url, notice: 'Member was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -76,6 +76,6 @@ def set_member
       @member = Member.find(params[:id])
     end
     def member_params
-      params[:member]
+      params.require(:member).permit(:email, :password)
     end
 end
diff --git a/members_controller.rb b/members_controller.rb
@@ -1,5 +1,5 @@
 class Admin::MembersController  < Member::ApplicationController
-  before_filter :authenticate_member!
+  before_filter :authenticate_admin!
   before_action :set_member, only: [:show, :edit, :update, :destroy]
 
   # GET /members

diff --git a/members_controller.rb b/members_controller.rb
@@ -1,4 +1,4 @@
-class Member::MembersController  < Member::ApplicationController
+class Admin::MembersController  < Member::ApplicationController
   before_filter :authenticate_member!
   before_action :set_member, only: [:show, :edit, :update, :destroy]
 

diff --git a/members_controller.rb b/members_controller.rb
@@ -0,0 +1,81 @@
+class Member::MembersController  < Member::ApplicationController
+  before_filter :authenticate_member!
+  before_action :set_member, only: [:show, :edit, :update, :destroy]
+
+  # GET /members
+  # GET /members.json
+  def index
+    @members = Member.page(params[:page]).order('created_at DESC')
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  # GET /members/1
+  # GET /members/1.json
+  def show
+  end
+
+  # GET /members/new
+  def new
+    @member = Member.new
+  end
+
+  # GET /members/1/edit
+  def edit
+  end
+
+  # POST /members
+  # POST /members.json
+  def create
+    @member = Member.new(member_params)
+
+    respond_to do |format|
+      if @member.save
+        redirect_to @member, notice: 'Member was successfully created.'
+      else
+        render :new
+      end
+      if @member.save
+        format.html { redirect_to @member, notice: 'Member was successfully created.' }
+        format.json { render :show, status: :created, location: @member }
+      else
+        format.html { render :new }
+        format.json { render json: @member.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /members/1
+  # PATCH/PUT /members/1.json
+  def update
+    respond_to do |format|
+      if @member.update(member_params)
+        format.html { redirect_to @member, notice: 'Member was successfully updated.' }
+        format.json { render :show, status: :ok, location: @member }
+      else
+        format.html { render :edit }
+        format.json { render json: @member.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /members/1
+  # DELETE /members/1.json
+  def destroy
+    @member.destroy
+    respond_to do |format|
+      format.html { redirect_to members_url, notice: 'Member was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    def set_member
+      @member = Member.find(params[:id])
+    end
+    def member_params
+      params[:member]
+    end
+end