Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / assets / javascripts / controllers / artists.js.coffee

diff --git a/app/assets/javascripts/controllers/artists.js.coffee b/app/assets/javascripts/controllers/artists.js.coffee
index 96c8caf..8e8f85a 100644 (file)
--- a/app/assets/javascripts/controllers/artists.js.coffee
+++ b/app/assets/javascripts/controllers/artists.js.coffee
@@ -17,8 +17,7 @@ class Pettanr.ArtistsController extends Pettanr.AppController
   \r
   show_html: () -> \r
     @trigger('title', @params, @item.get('name'))\r
-    show = new Pettanr.Views.Artist.Show({\r
-      item: @item,\r
+    show = new Pettanr.Views.Artist.Show(@item, {\r
     })\r
     show.render()\r
     @trigger('ready', show)\r
@@ -33,7 +32,7 @@ class Pettanr.ArtistsController extends Pettanr.AppController
   \r
   edit: () ->\r
     @trigger('title', @params)\r
-    @form_new()\r
+    @form_edit()\r
     @trigger('done', @params)\r
   \r
   create: () ->\r
@@ -55,7 +54,9 @@ class Pettanr.ArtistsController extends Pettanr.AppController
     @item.destroy()\r
   \r
   post_success: (model, response) ->\r
-    @trigger('redirect', '/home/configure')\r
+    @trigger('unlock', @params, @form)\r
+    @trigger('redirect', model.show_url())\r
+    # @trigger('redirect', '/home/configure')\r
     @trigger('success', model, response)\r
   \r
   @is_deny_action_on_picker: (params) ->\r