fix event names

diff --git a/app/assets/javascripts/controllers/artists.js.coffee b/app/assets/javascripts/controllers/artists.js.coffee
index 3a79207..ca3317d 100644 (file)
--- a/app/assets/javascripts/controllers/artists.js.coffee
+++ b/app/assets/javascripts/controllers/artists.js.coffee
@@ -1,12 +1,12 @@
 class Pettanr.ArtistsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('name'))\r
+      @trigger('title', @params, @item.get('name'))\r
       show = new Pettanr.Views.Artist.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -25,26 +25,31 @@ class Pettanr.ArtistsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new(@create)\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit(@update)\r
   \r
-  create: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', '/home/configure')\r
-    else\r
-      @not_created()\r
+  create: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
-  update: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', '/home/configure')\r
-    else\r
-      @not_updated()\r
+  update: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r
+  post_success: (model, response) ->\r
+    @trigger('redirect', '/home/configure')\r
+    @trigger('success', model, response)\r
+  \r

diff --git a/app/assets/javascripts/controllers/authors.js.coffee b/app/assets/javascripts/controllers/authors.js.coffee
index 5299023..01cbdc5 100644 (file)
--- a/app/assets/javascripts/controllers/authors.js.coffee
+++ b/app/assets/javascripts/controllers/authors.js.coffee
@@ -1,12 +1,12 @@
 class Pettanr.AuthorsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('name'))\r
+      @trigger('title', @params, @item.get('name'))\r
       show = new Pettanr.Views.Author.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -25,26 +25,31 @@ class Pettanr.AuthorsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new(@create)\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit(@update)\r
   \r
-  create: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', '/home/configure')\r
-    else\r
-      @not_created()\r
+  create: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
-  update: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', '/home/configure')\r
-    else\r
-      @not_updated()\r
+  update: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r
+  post_success: (model, response) ->\r
+    @trigger('redirect', '/home/configure')\r
+    @trigger('success', model, response)\r
+  \r

diff --git a/app/assets/javascripts/controllers/balloons.js.coffee b/app/assets/javascripts/controllers/balloons.js.coffee
index f33d702..3a73435 100644 (file)
--- a/app/assets/javascripts/controllers/balloons.js.coffee
+++ b/app/assets/javascripts/controllers/balloons.js.coffee
@@ -1,19 +1,19 @@
 class Pettanr.BalloonsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_speech_balloon: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.Balloon.Show({\r
         item: @item,\r
@@ -36,9 +36,3 @@ class Pettanr.BalloonsController extends Pettanr.AppController
   \r
   edit: () ->\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/comic_stories.js.coffee b/app/assets/javascripts/controllers/comic_stories.js.coffee
index 60c8426..1960a7a 100644 (file)
--- a/app/assets/javascripts/controllers/comic_stories.js.coffee
+++ b/app/assets/javascripts/controllers/comic_stories.js.coffee
@@ -1,23 +1,23 @@
 class Pettanr.ComicStoriesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_comic: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_story: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.ComicStory.Show({\r
         item: @item,\r
@@ -37,16 +37,29 @@ class Pettanr.ComicStoriesController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/comics.js.coffee b/app/assets/javascripts/controllers/comics.js.coffee
index 0a429b1..3d1ffc2 100644 (file)
--- a/app/assets/javascripts/controllers/comics.js.coffee
+++ b/app/assets/javascripts/controllers/comics.js.coffee
@@ -1,20 +1,20 @@
 class Pettanr.ComicsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_story: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('title'))\r
+      @trigger('title', @params, @item.get('title'))\r
       show = new Pettanr.Views.Comic.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -33,26 +33,29 @@ class Pettanr.ComicsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new(@create)\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit(@update)\r
   \r
-  create: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', form.item.show_url())\r
-    else\r
-      @not_created()\r
+  create: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
-  update: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', form.item.show_url())\r
-    else\r
-      @not_updated()\r
+  update: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/ground_colors.js.coffee b/app/assets/javascripts/controllers/ground_colors.js.coffee
index ab28395..02cc6a0 100644 (file)
--- a/app/assets/javascripts/controllers/ground_colors.js.coffee
+++ b/app/assets/javascripts/controllers/ground_colors.js.coffee
@@ -1,20 +1,20 @@
 class Pettanr.GroundColorsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.GroundColor.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -36,9 +36,3 @@ class Pettanr.GroundColorsController extends Pettanr.AppController
   \r
   edit: () ->\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/ground_pictures.js.coffee b/app/assets/javascripts/controllers/ground_pictures.js.coffee
index 9e8dcf9..7be455b 100644 (file)
--- a/app/assets/javascripts/controllers/ground_pictures.js.coffee
+++ b/app/assets/javascripts/controllers/ground_pictures.js.coffee
@@ -1,21 +1,21 @@
 class Pettanr.GroundPicturesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.GroundPicture.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -37,9 +37,3 @@ class Pettanr.GroundPicturesController extends Pettanr.AppController
   \r
   edit: () ->\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/home.js.coffee b/app/assets/javascripts/controllers/home.js.coffee
index cacc223..74c444c 100644 (file)
--- a/app/assets/javascripts/controllers/home.js.coffee
+++ b/app/assets/javascripts/controllers/home.js.coffee
@@ -1,5 +1,5 @@
 class Pettanr.HomeController extends Pettanr.AppController\r
-\r
+  \r
   configure: () ->\r
     view = new Pettanr.Views.Home.Configure({\r
       el: "#pettanr",\r
@@ -9,67 +9,67 @@ class Pettanr.HomeController extends Pettanr.AppController
     view.render()\r
   \r
   scrolls: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   scroll_panels: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   comics: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   comic_stories: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   stories: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   story_sheets: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   sheets: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   sheet_panels: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   panels: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   panel_pictures: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   speech_balloons: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   balloons: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   speeches: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   ground_pictures: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   ground_colors: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   resource_pictures: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   scrolls_count: () ->\r

diff --git a/app/assets/javascripts/controllers/license_groups.js.coffee b/app/assets/javascripts/controllers/license_groups.js.coffee
index a7e98f9..d30c628 100644 (file)
--- a/app/assets/javascripts/controllers/license_groups.js.coffee
+++ b/app/assets/javascripts/controllers/license_groups.js.coffee
@@ -1,12 +1,12 @@
 class Pettanr.LicenseGroupsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.LicenseGroup.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -25,16 +25,10 @@ class Pettanr.LicenseGroupsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/licenses.js.coffee b/app/assets/javascripts/controllers/licenses.js.coffee
index cd42803..84752e2 100644 (file)
--- a/app/assets/javascripts/controllers/licenses.js.coffee
+++ b/app/assets/javascripts/controllers/licenses.js.coffee
@@ -1,20 +1,20 @@
 class Pettanr.LicensesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_icense_group: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_system_picture: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.License.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -33,16 +33,27 @@ class Pettanr.LicensesController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee b/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee
index 9fd9529..ef7e767 100644 (file)
--- a/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee
+++ b/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee
@@ -1,6 +1,6 @@
 class Pettanr.OriginalPictureLicenseGroupsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r

diff --git a/app/assets/javascripts/controllers/original_picture_licenses.js.coffee b/app/assets/javascripts/controllers/original_picture_licenses.js.coffee
index c2d01c4..9bc1a05 100644 (file)
--- a/app/assets/javascripts/controllers/original_picture_licenses.js.coffee
+++ b/app/assets/javascripts/controllers/original_picture_licenses.js.coffee
@@ -1,6 +1,6 @@
 class Pettanr.OriginalPictureLicensesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r

diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee
index 39816eb..d9e7f84 100644 (file)
--- a/app/assets/javascripts/controllers/original_pictures.js.coffee
+++ b/app/assets/javascripts/controllers/original_pictures.js.coffee
@@ -1,15 +1,15 @@
 class Pettanr.OriginalPicturesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   history: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.OriginalPicture.Show({\r
         item: @item,\r
@@ -33,8 +33,21 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController
   edit: () ->\r
   \r
   create: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/panel_pictures.js.coffee b/app/assets/javascripts/controllers/panel_pictures.js.coffee
index c083c89..1ecc26f 100644 (file)
--- a/app/assets/javascripts/controllers/panel_pictures.js.coffee
+++ b/app/assets/javascripts/controllers/panel_pictures.js.coffee
@@ -1,20 +1,20 @@
 class Pettanr.PanelPicturesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.PanelPicture.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -36,9 +36,3 @@ class Pettanr.PanelPicturesController extends Pettanr.AppController
   \r
   edit: () ->\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee
index de3b2e0..ffea984 100644 (file)
--- a/app/assets/javascripts/controllers/panels.js.coffee
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -1,29 +1,29 @@
 class Pettanr.PanelsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_scroll: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_sheet: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_speech_balloon_template: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () ->\r
     @item = new Pettanr.Panel.WithElements({id: @item.get('id')}) # retake panel for 'with_elements' mode\r
     @item.fetch({cache: false}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.Panel.Show({\r
         panel: @item,\r
         operators: @operators,\r
@@ -44,12 +44,12 @@ class Pettanr.PanelsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @set_new()\r
     @editor()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @set_model()\r
     panel = new Pettanr.Panel({id: @params['id']})\r
     @item = panel.with_elements()\r
@@ -61,8 +61,21 @@ class Pettanr.PanelsController extends Pettanr.AppController
   editor: () ->\r
   \r
   create: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/pictures.js.coffee b/app/assets/javascripts/controllers/pictures.js.coffee
index ee4066f..8d81b95 100644 (file)
--- a/app/assets/javascripts/controllers/pictures.js.coffee
+++ b/app/assets/javascripts/controllers/pictures.js.coffee
@@ -1,15 +1,15 @@
 class Pettanr.PicturesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_artist: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.Picture.Show({\r
         item: @item,\r

diff --git a/app/assets/javascripts/controllers/resource_pictures.js.coffee b/app/assets/javascripts/controllers/resource_pictures.js.coffee
index a39e24f..98c8f74 100644 (file)
--- a/app/assets/javascripts/controllers/resource_pictures.js.coffee
+++ b/app/assets/javascripts/controllers/resource_pictures.js.coffee
@@ -1,23 +1,23 @@
 class Pettanr.ResourcePicturesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_artist: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_license_group: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_license: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.ResourcePicture.Show({\r
         item: @item,\r

diff --git a/app/assets/javascripts/controllers/scroll_panels.js.coffee b/app/assets/javascripts/controllers/scroll_panels.js.coffee
index 946f47b..a4329d3 100644 (file)
--- a/app/assets/javascripts/controllers/scroll_panels.js.coffee
+++ b/app/assets/javascripts/controllers/scroll_panels.js.coffee
@@ -1,23 +1,23 @@
 class Pettanr.ScrollPanelsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_scroll: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.ScrollPanel.Show({\r
         item: @item,\r
@@ -41,16 +41,29 @@ class Pettanr.ScrollPanelsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/scrolls.js.coffee b/app/assets/javascripts/controllers/scrolls.js.coffee
index cd05924..09068d4 100644 (file)
--- a/app/assets/javascripts/controllers/scrolls.js.coffee
+++ b/app/assets/javascripts/controllers/scrolls.js.coffee
@@ -53,13 +53,13 @@ class Pettanr.ScrollsController extends Pettanr.AppController
     @form_edit()\r
   \r
   create: () ->\r
-    @form.item.overwrite(@operators)\r
+    @form.item.overwrite({operators: @operators})\r
     @listenTo(@form, 'success', @post_success)\r
     @listenTo(@form, 'fail', @post_fail)\r
     @form.save()\r
   \r
   update: () ->\r
-    @form.item.overwrite(@operators)\r
+    @form.item.overwrite({operators: @operators})\r
     @listenTo(@form, 'success', @post_success)\r
     @listenTo(@form, 'fail', @post_fail)\r
     @form.save()\r
@@ -71,6 +71,3 @@ class Pettanr.ScrollsController extends Pettanr.AppController
       @listenTo(@item, 'destroy:fail', @destroy_fail)\r
       @item.destroy()\r
   \r
-  redirected: (view) ->\r
-    @trigger('ready', view)\r
-  \r

diff --git a/app/assets/javascripts/controllers/sheet_panels.js.coffee b/app/assets/javascripts/controllers/sheet_panels.js.coffee
index 3291f88..74d673f 100644 (file)
--- a/app/assets/javascripts/controllers/sheet_panels.js.coffee
+++ b/app/assets/javascripts/controllers/sheet_panels.js.coffee
@@ -1,23 +1,23 @@
 class Pettanr.SheetPanelsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_sheet: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.SheetPanel.Show({\r
         item: @item,\r
@@ -37,16 +37,29 @@ class Pettanr.SheetPanelsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/sheets.js.coffee b/app/assets/javascripts/controllers/sheets.js.coffee
index e9c02d1..59e1a8e 100644 (file)
--- a/app/assets/javascripts/controllers/sheets.js.coffee
+++ b/app/assets/javascripts/controllers/sheets.js.coffee
@@ -1,24 +1,24 @@
 class Pettanr.SheetsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_story: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.Sheet.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -37,16 +37,29 @@ class Pettanr.SheetsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee
index 2ab81b7..72a9be8 100644 (file)
--- a/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee
+++ b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee
@@ -1,20 +1,20 @@
 class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_system_picture: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.SpeechBalloonTemplate.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -33,16 +33,27 @@ class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/speech_balloons.js.coffee b/app/assets/javascripts/controllers/speech_balloons.js.coffee
index 0287694..0207dea 100644 (file)
--- a/app/assets/javascripts/controllers/speech_balloons.js.coffee
+++ b/app/assets/javascripts/controllers/speech_balloons.js.coffee
@@ -1,24 +1,24 @@
 class Pettanr.SpeechBalloonsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_panel: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_speech_balloon_template: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.SpeechBalloon.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -37,16 +37,10 @@ class Pettanr.SpeechBalloonsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/speeches.js.coffee b/app/assets/javascripts/controllers/speeches.js.coffee
index b6dab9c..ff659df 100644 (file)
--- a/app/assets/javascripts/controllers/speeches.js.coffee
+++ b/app/assets/javascripts/controllers/speeches.js.coffee
@@ -1,19 +1,19 @@
 class Pettanr.SpeechesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_speech_balloon: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.Speech.Show({\r
         item: @item,\r
@@ -36,9 +36,3 @@ class Pettanr.SpeechesController extends Pettanr.AppController
   \r
   edit: () ->\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/stories.js.coffee b/app/assets/javascripts/controllers/stories.js.coffee
index 1a82128..d4fc2c5 100644 (file)
--- a/app/assets/javascripts/controllers/stories.js.coffee
+++ b/app/assets/javascripts/controllers/stories.js.coffee
@@ -1,24 +1,24 @@
 class Pettanr.StoriesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_comic: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_sheet: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('title'))\r
+      @trigger('title', @params, @item.get('title'))\r
       show = new Pettanr.Views.Story.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -37,26 +37,29 @@ class Pettanr.StoriesController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new(@create)\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit(@update)\r
   \r
-  create: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', form.item.show_url())\r
-    else\r
-      @not_created()\r
+  create: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
-  update: (form) ->\r
-    form.item.overwrite(@operators)\r
-    if form.save()\r
-      @trigger('redirect', form.item.show_url())\r
-    else\r
-      @not_updated()\r
+  update: () ->\r
+    @form.item.overwrite({operators: @operators})\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/story_sheets.js.coffee b/app/assets/javascripts/controllers/story_sheets.js.coffee
index 4d2b748..a460b62 100644 (file)
--- a/app/assets/javascripts/controllers/story_sheets.js.coffee
+++ b/app/assets/javascripts/controllers/story_sheets.js.coffee
@@ -1,23 +1,23 @@
 class Pettanr.StorySheetsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_author: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_story: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_sheet: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.StorySheet.Show({\r
         item: @item,\r
@@ -37,16 +37,29 @@ class Pettanr.StorySheetsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @form.item.overwrite(@operators)\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/controllers/system_pictures.js.coffee b/app/assets/javascripts/controllers/system_pictures.js.coffee
index c47ddba..473b745 100644 (file)
--- a/app/assets/javascripts/controllers/system_pictures.js.coffee
+++ b/app/assets/javascripts/controllers/system_pictures.js.coffee
@@ -1,11 +1,11 @@
 class Pettanr.SystemPicturesController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @item.fetch({cache: true}).done =>\r
       show = new Pettanr.Views.SystemPicture.Show({\r
         item: @item,\r
@@ -24,9 +24,3 @@ class Pettanr.SystemPicturesController extends Pettanr.AppController
   \r
   count: () ->\r
   \r
-  create: () ->\r
-  \r
-  update: () ->\r
-  \r
-  destroy: () ->\r
-    \r

diff --git a/app/assets/javascripts/controllers/writing_formats.js.coffee b/app/assets/javascripts/controllers/writing_formats.js.coffee
index 067990e..fc4370a 100644 (file)
--- a/app/assets/javascripts/controllers/writing_formats.js.coffee
+++ b/app/assets/javascripts/controllers/writing_formats.js.coffee
@@ -1,16 +1,16 @@
 class Pettanr.WritingFormatsController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   by_system_picture: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   show_html: () -> \r
     @item.fetch({cache: true}).done =>\r
-      @trigger('retitle', @params, @item.get('caption'))\r
+      @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.WritingFormat.Show({\r
         item: @item,\r
         operators: @operators\r
@@ -29,16 +29,27 @@ class Pettanr.WritingFormatsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   create: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   update: () ->\r
+    @listenTo(@form, 'success', @post_success)\r
+    @listenTo(@form, 'fail', @post_fail)\r
+    @form.save()\r
   \r
   destroy: () ->\r
-    \r
+    @set_show()\r
+    @item.fetch({cache: true}).done =>\r
+      @listenTo(@item, 'destroy:success', @destroy_success)\r
+      @listenTo(@item, 'destroy:fail', @destroy_fail)\r
+      @item.destroy()\r
+  \r

diff --git a/app/assets/javascripts/locmare/profiler.js.coffee b/app/assets/javascripts/locmare/profiler.js.coffee
index a8e4c65..5568ef8 100644 (file)
--- a/app/assets/javascripts/locmare/profiler.js.coffee
+++ b/app/assets/javascripts/locmare/profiler.js.coffee
@@ -12,8 +12,8 @@ class Locmare.Profiler extends Backbone.View
     @header = new Locmare.ProfilerModule.Header({profiler: this})\r
     @columns = new Locmare.ProfilerModule.Column({profiler: this})\r
     @associations = new Locmare.ProfilerModule.Association({'profiler': this, association_manifest: @profiler_manifest.associations})\r
-    @listenTo(@header, 'navigate', @navigate)\r
-    @listenTo(@associations, 'navigate', @navigate)\r
+    @listenTo(@header, 'http_get', @http_get)\r
+    @listenTo(@associations, 'http_get', @http_get)\r
   \r
   render: () ->\r
     this.$el.html('')\r
@@ -31,8 +31,8 @@ class Locmare.Profiler extends Backbone.View
   image_dir: () ->\r
     '/images/'\r
   \r
-  navigate: (url) ->\r
-    @trigger('navigate', url)\r
+  http_get: (url) ->\r
+    @trigger('http_get', url)\r
   \r
 class Locmare.ProfilerModule\r
 \r

diff --git a/app/assets/javascripts/locmare/profiler/association.js.coffee b/app/assets/javascripts/locmare/profiler/association.js.coffee
index 2d12174..5737005 100644 (file)
--- a/app/assets/javascripts/locmare/profiler/association.js.coffee
+++ b/app/assets/javascripts/locmare/profiler/association.js.coffee
@@ -19,17 +19,17 @@ class Locmare.ProfilerModule.Association extends Backbone.View
     caption = new Tag.Div({class_name: 'caption', content: 'belongs_to'})\r
     this.$el.append(caption.render().el)\r
     _.each @belongs_to, (f) =>\r
-      @listenTo(f, 'navigate', @navigate)\r
+      @listenTo(f, 'http_get', @http_get)\r
       this.$el.append(f.render().el)\r
     caption = new Tag.Div({class_name: 'caption', content: 'has_many'})\r
     this.$el.append(caption.render().el)\r
     _.each @has_many, (f) =>\r
-      @listenTo(f, 'navigate', @navigate)\r
+      @listenTo(f, 'http_get', @http_get)\r
       this.$el.append(f.render().el)\r
     caption = new Tag.Div({class_name: 'caption', content: 'has_one'})\r
     this.$el.append(caption.render().el)\r
     _.each @has_one, (f) =>\r
-      @listenTo(f, 'navigate', @navigate)\r
+      @listenTo(f, 'http_get', @http_get)\r
       this.$el.append(f.render().el)\r
     this\r
   \r
@@ -39,8 +39,8 @@ class Locmare.ProfilerModule.Association extends Backbone.View
   model_manifest: () ->\r
     Manifest.manifest().models[@profiler.item_name]\r
   \r
-  navigate: (url) ->\r
-    @trigger('navigate', url)\r
+  http_get: (url) ->\r
+    @trigger('http_get', url)\r
   \r
 class Locmare.ProfilerModule.AssociationModule\r
 \r

diff --git a/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee b/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee
index 3821362..4813f60 100644 (file)
--- a/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee
+++ b/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee
@@ -13,7 +13,7 @@ class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Backbone.View
         pager: null, \r
         operators: @profiler().operators\r
       })\r
-      @listenTo(@filer, 'navigate', @navigate)\r
+      @listenTo(@filer, 'http_get', @http_get)\r
       @render()\r
   \r
   render: () ->\r
@@ -39,6 +39,6 @@ class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Backbone.View
   profiler: () ->\r
     @association.profiler\r
   \r
-  navigate: (url) ->\r
-    @trigger('navigate', url)\r
+  http_get: (url) ->\r
+    @trigger('http_get', url)\r
   \r

diff --git a/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee b/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee
index eb3d129..919a74a 100644 (file)
--- a/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee
+++ b/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee
@@ -18,7 +18,7 @@ class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View
         pager: @pager, \r
         operators: @profiler().operators\r
       })\r
-      @listenTo(@filer, 'navigate', @navigate)\r
+      @listenTo(@filer, 'http_get', @http_get)\r
       @render()\r
     )\r
   \r
@@ -35,6 +35,6 @@ class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View
   profiler: () ->\r
     @association.profiler\r
   \r
-  navigate: (url) ->\r
-    @trigger('navigate', url)\r
+  http_get: (url) ->\r
+    @trigger('http_get', url)\r
  \r

diff --git a/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee b/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee
index d9b9f8c..087d18a 100644 (file)
--- a/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee
+++ b/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee
@@ -18,7 +18,7 @@ class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View
         pager: @pager, \r
         operators: @profiler().operators\r
       })\r
-      @listenTo(@filer, 'navigate', @navigate)\r
+      @listenTo(@filer, 'http_get', @http_get)\r
       @render()\r
     )\r
   \r
@@ -37,6 +37,6 @@ class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View
   profiler: () ->\r
     @association.profiler\r
   \r
-  navigate: (url) ->\r
-    @trigger('navigate', url)\r
+  http_get: (url) ->\r
+    @trigger('http_get', url)\r
   \r

diff --git a/app/assets/javascripts/locmare/profiler/header.js.coffee b/app/assets/javascripts/locmare/profiler/header.js.coffee
index 96388e5..8db142b 100644 (file)
--- a/app/assets/javascripts/locmare/profiler/header.js.coffee
+++ b/app/assets/javascripts/locmare/profiler/header.js.coffee
@@ -10,12 +10,12 @@ class Locmare.ProfilerModule.Header extends Backbone.View
       pager: @pager, \r
       operators: @profiler.operators\r
     })\r
-    @listenTo(@filer, 'navigate', @navigate)\r
+    @listenTo(@filer, 'http_get', @http_get)\r
   \r
   render: () ->\r
     this.$el.html(@filer.el)\r
     this\r
   \r
-  navigate: (url) ->\r
-    @trigger('navigate', url)\r
+  http_get: (url) ->\r
+    @trigger('http_get', url)\r
   \r

diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index c347941..834bf3f 100644 (file)
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -22,6 +22,11 @@ class Pettanr.Panel extends Peta.Root
   with_elements: () ->\r
     new Pettanr.Panel.WithElements({id: @get('id')})\r
   \r
+  overwrite: (options) ->\r
+    operators = options.operators\r
+    return false if not operators.author\r
+    @set('author_id', operators.author.id)\r
+  \r
   is_visible: (operators) ->\r
     switch super(operators)\r
       when null # super return\r

diff --git a/app/assets/javascripts/models/sheet.js.coffee b/app/assets/javascripts/models/sheet.js.coffee
index 1c377ad..1be6aee 100644 (file)
--- a/app/assets/javascripts/models/sheet.js.coffee
+++ b/app/assets/javascripts/models/sheet.js.coffee
@@ -16,6 +16,11 @@ class Pettanr.Sheet extends Peta.Root
   author: () ->\r
     new Pettanr.Author({id: @get('author_id')})\r
   \r
+  overwrite: (options) ->\r
+    operators = options.operators\r
+    return false if not operators.author\r
+    @set('author_id', operators.author.id)\r
+  \r
   is_visible: (operators) ->\r
     switch super(operators)\r
       when null\r

diff --git a/app/assets/javascripts/models/story.js.coffee b/app/assets/javascripts/models/story.js.coffee
index df37247..6d5482f 100644 (file)
--- a/app/assets/javascripts/models/story.js.coffee
+++ b/app/assets/javascripts/models/story.js.coffee
@@ -16,6 +16,11 @@ class Pettanr.Story extends Peta.Binder
   author: () ->\r
     new Pettanr.Author({id: @get('author_id')})\r
   \r
+  overwrite: (options) ->\r
+    operators = options.operators\r
+    return false if not operators.author\r
+    @set('author_id', operators.author.id)\r
+  \r
   is_visible: (operators) ->\r
     switch super(operators)\r
       when null\r

diff --git a/app/assets/javascripts/pettanr/action_filter.js.coffee b/app/assets/javascripts/pettanr/action_filter.js.coffee
index 1b2cac4..141fcb2 100644 (file)
--- a/app/assets/javascripts/pettanr/action_filter.js.coffee
+++ b/app/assets/javascripts/pettanr/action_filter.js.coffee
@@ -2,84 +2,192 @@ class Pettanr.ActionFilter
   \r
   @suply_default: (reader, resource_reader, user, author) ->\r
     {\r
-      reader: _.union(default_reader_filters, reader),\r
-      resource_reader: _.union(default_resource_reader_filters, resource_reader),\r
-      user: _.union(default_user_filters, user),\r
-      author: _.union(default_author_filters, author)\r
+      reader: _.union(@default_reader_filters, reader),\r
+      resource_reader: _.union(@default_resource_reader_filters, resource_reader),\r
+      user: _.union(@default_user_filters, user),\r
+      author: _.union(@default_author_filters, author)\r
     }\r
   \r
+  @default_reader_filters = ['index', 'show']\r
+  @default_resource_reader_filters = []\r
+  @default_user_filters = ['new', 'create', 'edit', 'update', 'destroy']\r
+  @default_author_filters = ['new', 'create', 'edit', 'update', 'destroy']\r
+  \r
   @sns_filters: () ->\r
     default_reader_filters = ['index', 'show']\r
     default_resource_reader_filters = []\r
     default_user_filters = ['new', 'create', 'edit', 'update', 'destroy']\r
     default_author_filters = ['new', 'create', 'edit', 'update', 'destroy']\r
     {\r
-      'folders': {\r
-        reader: _.union(default_reader_filters, ['root', 'watch']),\r
-        resource_reader: _.union(default_resource_reader_filters, []),\r
-        user: _.union(default_user_filters, []),\r
-        author: _.union(default_author_filters, [])\r
-      },\r
-      'scrolls': {\r
-        reader: _.union(default_reader_filters, ['play', 'by_panel', 'by_author']),\r
-        resource_reader: _.union(default_resource_reader_filters, []),\r
-        user: _.union(default_user_filters, []),\r
-        author: _.union(default_author_filters, [])\r
-      },\r
-      scroll_panels: {\r
-        reader: _.union(default_reader_filters, ['by_panel', 'by_scroll', 'by_author']),\r
-        resource_reader: _.union(default_resource_reader_filters, []),\r
-        user: _.union(default_user_filters, []),\r
-        author: _.union(default_author_filters, [])\r
-      },\r
-      comics: {\r
-      },\r
-      comic_stories: {\r
-      },\r
-      stories: {\r
-      },\r
-      story_sheets: {\r
-      },\r
-      sheets: {\r
-      },\r
-      sheet_panels: {\r
-      },\r
-      panels: {\r
-      },\r
-      panel_pictures: {\r
-      },\r
-      speech_balloons: {\r
-      },\r
-      speeches: {\r
-      },\r
-      balloons: {\r
-      },\r
-      ground_pictures: {\r
-      },\r
-      ground_colors: {\r
-      },\r
-      original_pictures: {\r
-      },\r
-      pictures: {\r
-      },\r
-      resource_pictures: {\r
-      },\r
-      speech_balloon_templates: {\r
-      },\r
-      writing_formats: {\r
-      },\r
-      license_groups: {\r
-      },\r
-      licenses: {\r
-      },\r
-      authors: {\r
-      },\r
-      artists: {\r
-      },\r
-      system_pictures: {\r
-      },\r
-      home: {\r
-      },\r
+      folders: @suply_default(\r
+        ['root', 'watch'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      scrolls: @suply_default(\r
+        ['play', 'by_panel', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      scroll_panels: @suply_default(\r
+        ['by_panel', 'by_scroll', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      comics: @suply_default(\r
+        ['play', 'by_story', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      comic_stories: @suply_default(\r
+        ['by_story', 'by_comic', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      stories: @suply_default(\r
+        ['play', 'by_comic', 'by_sheet', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      story_sheets: @suply_default(\r
+        ['by_story', 'by_sheet', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      sheets: @suply_default(\r
+        ['play', 'by_story', 'by_panel', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      sheet_panels: @suply_default(\r
+        ['by_panel', 'by_sheet', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      panels: @suply_default(\r
+        ['by_scroll', 'by_sheet', 'by_author', 'by_speech_balloon_template'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      panel_pictures: @suply_default(\r
+        ['by_panel', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      speech_balloons: @suply_default(\r
+        ['by_panel', 'by_author', 'by_speech_balloon_template'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      speeches: @suply_default(\r
+        ['by_author', 'by_speech_balloon', 'by_speech_balloon_template', 'by_writing_format'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      balloons: @suply_default(\r
+        [], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      ground_pictures: @suply_default(\r
+        ['by_panel', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      ground_colors: @suply_default(\r
+        ['by_panel', 'by_author'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      original_pictures: @suply_default(\r
+        ['history'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      pictures: @suply_default(\r
+        ['credit', 'search'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      resource_pictures: @suply_default(\r
+        ['credit', 'by_original_picture', 'by_license_group', 'by_license', 'by_artist'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      speech_balloon_templates: @suply_default(\r
+        ['by_panel', 'by_system_picture'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      writing_formats: @suply_default(\r
+        ['by_system_picture'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      license_groups: @suply_default(\r
+        ['by_resource_picture'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      licenses: @suply_default(\r
+        ['by_license_group', 'by_system_picture'], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      authors: @suply_default(\r
+        [], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      artists: @suply_default(\r
+        [], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      system_pictures: @suply_default(\r
+        [], \r
+        [], \r
+        [], \r
+        []\r
+      ),\r
+      home: @suply_default(\r
+        [\r
+          'profile', 'configure', 'create_token', 'delete_token', \r
+          'scrolls', 'scroll_panels', 'comics', 'comic_stories', 'stories', 'story_sheets', 'sheets', 'sheet_panels', \r
+          'panels', 'panel_pictures', 'speech_balloons', 'balloons', 'speeches', 'ground_pictures', 'ground_colors'\r
+        ], \r
+        [\r
+          'scrolls', 'scroll_panels', 'comics', 'comic_stories', 'stories', 'story_sheets', 'sheets', 'sheet_panels', \r
+          'panels', 'panel_pictures', 'speech_balloons', 'balloons', 'speeches', 'ground_pictures', 'ground_colors'\r
+        ], \r
+        [], \r
+        []\r
+      ),\r
     }\r
   \r
   @blog_filters: () ->\r

diff --git a/app/assets/javascripts/views/balloons/show.js.coffee b/app/assets/javascripts/views/balloons/show.js.coffee
index 197fc09..246054c 100644 (file)
--- a/app/assets/javascripts/views/balloons/show.js.coffee
+++ b/app/assets/javascripts/views/balloons/show.js.coffee
@@ -57,14 +57,14 @@ class Pettanr.Views.Balloon.Show extends Backbone.View
     this.$el.append(rb.render().el)\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @panel.author().show_url())\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    @trigger('navigate', item.show_url())\r
+    @trigger('http_get', item.show_url())\r
   \r

diff --git a/app/assets/javascripts/views/comics/show.js.coffee b/app/assets/javascripts/views/comics/show.js.coffee
index dad6329..b7c9513 100644 (file)
--- a/app/assets/javascripts/views/comics/show.js.coffee
+++ b/app/assets/javascripts/views/comics/show.js.coffee
@@ -44,17 +44,17 @@ class Pettanr.Views.Comic.Show extends Backbone.View
     this\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @panel.author().show_url())\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_edit: () ->\r
-    @trigger('navigate', @item.edit_url())\r
+    @trigger('http_get', @item.edit_url())\r
   \r
   click_destroy: () ->\r
-    @trigger('navigate', @item.destroy_url())\r
+    @trigger('http_get', @item.destroy_url())\r
   \r

diff --git a/app/assets/javascripts/views/ground_colors/show.js.coffee b/app/assets/javascripts/views/ground_colors/show.js.coffee
index 90eaeb8..5ff3fbb 100644 (file)
--- a/app/assets/javascripts/views/ground_colors/show.js.coffee
+++ b/app/assets/javascripts/views/ground_colors/show.js.coffee
@@ -55,14 +55,14 @@ class Pettanr.Views.GroundColor.Show extends Backbone.View
     this.$el.append(rb.render().el)\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @panel.author().show_url())\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    @trigger('navigate', item.show_url())\r
+    @trigger('http_get', item.show_url())\r
   \r

diff --git a/app/assets/javascripts/views/ground_pictures/show.js.coffee b/app/assets/javascripts/views/ground_pictures/show.js.coffee
index d3e62e5..e4b193b 100644 (file)
--- a/app/assets/javascripts/views/ground_pictures/show.js.coffee
+++ b/app/assets/javascripts/views/ground_pictures/show.js.coffee
@@ -55,14 +55,14 @@ class Pettanr.Views.GroundPicture.Show extends Backbone.View
     this.$el.append(rb.render().el)\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @panel.author().show_url())\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    @trigger('navigate', item.show_url())\r
+    @trigger('http_get', item.show_url())\r
   \r

diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee
index e2e2b66..e4b32b9 100644 (file)
--- a/app/assets/javascripts/views/panel_pictures/show.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/show.js.coffee
@@ -55,14 +55,14 @@ class Pettanr.Views.PanelPicture.Show extends Backbone.View
     this.$el.append(rb.render().el)\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @panel.author().show_url())\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    @trigger('navigate', item.show_url())\r
+    @trigger('http_get', item.show_url())\r
   \r

diff --git a/app/assets/javascripts/views/panels/show.js.coffee b/app/assets/javascripts/views/panels/show.js.coffee
index bd90eb3..9753d4c 100644 (file)
--- a/app/assets/javascripts/views/panels/show.js.coffee
+++ b/app/assets/javascripts/views/panels/show.js.coffee
@@ -48,19 +48,19 @@ class Pettanr.Views.Panel.Show extends Backbone.View
     this\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @panel.author().show_url())\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_edit: () ->\r
-    @trigger('navigate', @panel.edit_url())\r
+    @trigger('http_get', @panel.edit_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    @trigger('navigate', item.show_url())\r
+    @trigger('http_get', item.show_url())\r
   \r
 class Pettanr.Views.Panel.ShowModule\r
 class Pettanr.Views.Panel.ShowModule.Header extends Pettanr.Views.Show.Header\r

diff --git a/app/assets/javascripts/views/scrolls/show.js.coffee b/app/assets/javascripts/views/scrolls/show.js.coffee
index 7be4a15..1507f46 100644 (file)
--- a/app/assets/javascripts/views/scrolls/show.js.coffee
+++ b/app/assets/javascripts/views/scrolls/show.js.coffee
@@ -41,20 +41,20 @@ class Pettanr.Views.Scroll.Show extends Backbone.View
     this\r
   \r
   click_show: () ->\r
-    @trigger('navigate', @item.show_url())\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_play: () ->\r
-    @trigger('navigate', @item.play_url())\r
+    @trigger('http_get', @item.play_url())\r
   \r
   click_prof: () ->\r
-    @trigger('navigate', @item.prof_url())\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_author: () ->\r
-    @trigger('navigate', @item.author().show_url())\r
+    @trigger('http_get', @item.author().show_url())\r
   \r
   click_edit: () ->\r
-    @trigger('navigate', @item.edit_url())\r
+    @trigger('http_get', @item.edit_url())\r
   \r
   click_destroy: () ->\r
-    @trigger('navigate', @item.destroy_url())\r
+    @trigger('http_get', @item.destroy_url())\r
   \r

diff --git a/app/assets/javascripts/views/speech_balloons/show.js.coffee b/app/assets/javascripts/views/speech_balloons/show.js.coffee
index 334538d..a2fe35e 100644 (file)
--- a/app/assets/javascripts/views/speech_balloons/show.js.coffee
+++ b/app/assets/javascripts/views/speech_balloons/show.js.coffee
@@ -55,14 +55,14 @@ class Pettanr.Views.SpeechBalloon.Show extends Backbone.View
     this.$el.append(rb.render().el)\r
   \r
   click_show: () ->\r
-    window.router.navigate(@item.show_url(), true)\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    window.router.navigate(@panel.author().show_url(), true)\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    window.router.navigate(@item.prof_url(), true)\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    window.router.navigate(item.show_url(), true)\r
+    @trigger('http_get', item.show_url())\r
   \r

diff --git a/app/assets/javascripts/views/speeches/show.js.coffee b/app/assets/javascripts/views/speeches/show.js.coffee
index c75897a..7bb259e 100644 (file)
--- a/app/assets/javascripts/views/speeches/show.js.coffee
+++ b/app/assets/javascripts/views/speeches/show.js.coffee
@@ -57,14 +57,14 @@ class Pettanr.Views.Speech.Show extends Backbone.View
     this.$el.append(rb.render().el)\r
   \r
   click_show: () ->\r
-    window.router.navigate(@item.show_url(), true)\r
+    @trigger('http_get', @item.show_url())\r
   \r
   click_author: () ->\r
-    window.router.navigate(@panel.author().show_url(), true)\r
+    @trigger('http_get', @panel.author().show_url())\r
   \r
   click_prof: () ->\r
-    window.router.navigate(@item.prof_url(), true)\r
+    @trigger('http_get', @item.prof_url())\r
   \r
   click_credit_icon: (item) ->\r
-    window.router.navigate(item.show_url(), true)\r
+    @trigger('http_get', item.show_url())\r
   \r

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 83257f2..492e4ce 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -4,7 +4,7 @@ class ArtistsController < ApplicationController
     before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   else
     before_filter :authenticate_resource_reader, :only => [
-      :index, :show, :resource_pictures
+      :index, :show
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_artist, :only => [:edit, :update, :destroy]