t#30143:au and ar change

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 036131b..acd5fa2 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -84,7 +84,7 @@ class ArtistsController < ApplicationController
     @ar.overwrite @author
     respond_to do |format|
       if @ar.save
-        format.html { redirect_to @ar, notice: 'Artist was successfully created.' }
+        format.html { redirect_to root_path, notice: 'Artist was successfully created.' }
         format.json { render json: @ar.to_json(Artist.show_json_opt), status: :created, location: @artist }
       else
         format.html { render action: "new" }
@@ -102,7 +102,7 @@ class ArtistsController < ApplicationController
 
     respond_to do |format|
       if @ar.save
-        format.html { redirect_to @ar, notice: 'Artist was successfully updated.' }
+        format.html { redirect_to '/home/configure', notice: 'Artist was successfully updated.' }
         format.json { head :ok }
       else
         format.html { render action: "edit" }

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index f454c91..50adf08 100644 (file)
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -69,7 +69,7 @@ class AuthorsController < ApplicationController
     @au.overwrite @user.id
     respond_to do |format|
       if @au.save
-        format.html { redirect_to @au, notice: 'Author was successfully created.' }
+        format.html { redirect_to root_path, notice: 'Author was successfully created.' }
         format.json { render json: @au.to_json(Author.show_json_opt), status: :created, location: @artist }
       else
         format.html { render action: "new" }
@@ -85,7 +85,7 @@ class AuthorsController < ApplicationController
 
     respond_to do |format|
       if @au.save
-        format.html { redirect_to @au, notice: 'Author was successfully updated.' }
+        format.html { redirect_to '/home/configure', notice: 'Author was successfully updated.' }
         format.json { head :ok }
       else
         format.html { render action: "edit" }

diff --git a/app/models/artist.rb b/app/models/artist.rb
index 419e965..bfd9b76 100644 (file)
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -17,8 +17,13 @@ class Artist < ActiveRecord::Base
   end
   
   def own? au
-    return false unless au.is_a?(Author)
-    self.author_id == au.id
+    if au.is_a?(Author)
+      self.author_id == au.id
+    elsif au.is_a?(Artist)
+      self.id == au.id
+    else
+      false
+    end
   end
   
   def visible? au

diff --git a/app/views/artists/edit.html.erb b/app/views/artists/edit.html.erb
index 6e8a5d2..78e9943 100644 (file)
--- a/app/views/artists/edit.html.erb
+++ b/app/views/artists/edit.html.erb
@@ -2,6 +2,3 @@
 <p id="notice"><%= notice %></p>
 
 <%= render 'form', :ar => @ar %>
-configure
-<%= link_to 'Show', @ar %> |
-<%= link_to 'Back', artists_path %>

diff --git a/app/views/artists/show.html.erb b/app/views/artists/show.html.erb
index 0a09a71..c791476 100644 (file)
--- a/app/views/artists/show.html.erb
+++ b/app/views/artists/show.html.erb
@@ -16,4 +16,6 @@
   <%= l @ar.updated_at %>
 </p>
 
-<%= link_to t('link.back'), artists_path %>
+<% if @ar.own?(@artist) %>
+  <%= link_to t('link.edit'), edit_artist_path(@ar) %>
+<% end %>

diff --git a/app/views/authors/edit.html.erb b/app/views/authors/edit.html.erb
index dd7fb8f..c6fbf29 100644 (file)
--- a/app/views/authors/edit.html.erb
+++ b/app/views/authors/edit.html.erb
@@ -2,5 +2,3 @@
 
 <%= render 'form', :au => @au %>
 
-<%= link_to 'Show', @au %> |
-<%= link_to 'Back', authors_path %>

diff --git a/app/views/authors/show.html.erb b/app/views/authors/show.html.erb
index 3c114a2..555278e 100644 (file)
--- a/app/views/authors/show.html.erb
+++ b/app/views/authors/show.html.erb
@@ -16,4 +16,6 @@
   <%= l @au.updated_at %>
 </p>
 
-<%= link_to t('link.back'), authors_path %>
+<% if @au.own?(@author) %>
+  <%= link_to t('link.edit'), edit_author_path(@au) %>
+<% end %>

diff --git a/app/views/home/configure.html.erb b/app/views/home/configure.html.erb
index e6c6cfe..70dea5c 100644 (file)
--- a/app/views/home/configure.html.erb
+++ b/app/views/home/configure.html.erb
@@ -1,4 +1,5 @@
 <h1><%= t '.title' -%></h1>
+<p id="notice"><%= notice %></p>
 
 <%= t('home.configure.caption', :email => @user.email) %>
 <table class="no-border" width="100%">

diff --git a/spec/controllers/artists_controller_spec.rb b/spec/controllers/artists_controller_spec.rb
index c6ae277..0c61680 100644 (file)
--- a/spec/controllers/artists_controller_spec.rb
+++ b/spec/controllers/artists_controller_spec.rb
@@ -125,9 +125,9 @@ describe ArtistsController do
         Artist.should_receive(:show).exactly(1)
         get :show
       end
-      it '@artistにアレを取得している' do
+      it '@arにアレを取得している' do
         get :show, :id => @artist.id
-        assigns(:artist).should eq(@artist)
+        assigns(:ar).should eq(@artist)
       end
       context 'html形式' do
         it 'showテンプレートを描画する' do
@@ -321,10 +321,10 @@ describe ArtistsController do
       end
     end
     context 'つつがなく終わるとき' do
-      it "@artistに作成された絵師を保持していて、それがDBにある" do
+      it "@arに作成された絵師を保持していて、それがDBにある" do
         post :create, :artist => @attr
-        assigns(:artist).should be_a(Artist)
-        assigns(:artist).should be_persisted
+        assigns(:ar).should be_a(Artist)
+        assigns(:ar).should be_persisted
       end
       context 'html形式' do
         it 'ステータスコード302 Foundを返す' do
@@ -332,10 +332,10 @@ describe ArtistsController do
           post :create, :artist => @attr
           response.status.should eq 302
         end
-        it '作成された絵師の表示ページへ遷移する' do
+        it 'トップページへ遷移する' do
 #          Artist.any_instance.stub(:save).and_return(true)
           post :create, :artist => @attr
-          response.should redirect_to(Artist.last)
+          response.should redirect_to(root_path)
         end
       end
       context 'json形式' do
@@ -497,9 +497,9 @@ describe ArtistsController do
         Artist.any_instance.should_receive(:save).exactly(1)
         put :update, :id => @artist.id, :artist => @attr
       end
-      it '@artistにアレを取得している' do
+      it '@arにアレを取得している' do
         put :update, :id => @artist.id, :artist => @attr
-        assigns(:artist).should eq @artist
+        assigns(:ar).should eq @artist
       end
     end
     context 'つつがなく終わるとき' do
@@ -513,9 +513,9 @@ describe ArtistsController do
           put :update, :id => @artist.id, :artist => @attr
           response.status.should eq 302
         end
-        it '更新された絵師の表示ページへ遷移する' do
+        it '設定ページへ遷移する' do
           put :update, :id => @artist.id, :artist => @attr
-          response.should redirect_to(@artist)
+          response.should redirect_to('/home/configure')
         end
       end
       context 'json形式' do

diff --git a/spec/controllers/authors_controller_spec.rb b/spec/controllers/authors_controller_spec.rb
index da6819d..ff4a766 100644 (file)
--- a/spec/controllers/authors_controller_spec.rb
+++ b/spec/controllers/authors_controller_spec.rb
@@ -337,10 +337,10 @@ describe AuthorsController do
           post :create, :author => @attr
           response.status.should eq 302
         end
-        it '作成された作家の表示ページへ遷移する' do
+        it 'トップページへ遷移する' do
 #          Author.any_instance.stub(:save).and_return(true)
           post :create, :author => @attr
-          response.should redirect_to(Author.last)
+          response.should redirect_to(root_path)
         end
       end
       context 'json形式' do
@@ -522,9 +522,9 @@ describe AuthorsController do
           put :update, :id => @author.id, :author => @attr
           response.status.should eq 302
         end
-        it '更新された作家の表示ページへ遷移する' do
+        it '設定ページへ遷移する' do
           put :update, :id => @author.id, :author => @attr
-          response.should redirect_to(@author)
+          response.should redirect_to('/home/configure')
         end
       end
       context 'json形式' do