From 16156f8c2cc82d5ae69e3c2b7d5cc35ddbfa92a3 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Fri, 6 Mar 2015 15:58:29 +0900 Subject: [PATCH] fix event names --- .../javascripts/controllers/artists.js.coffee | 39 ++-- .../javascripts/controllers/authors.js.coffee | 39 ++-- .../javascripts/controllers/balloons.js.coffee | 14 +- .../controllers/comic_stories.js.coffee | 29 ++- .../javascripts/controllers/comics.js.coffee | 41 ++-- .../controllers/ground_colors.js.coffee | 14 +- .../controllers/ground_pictures.js.coffee | 16 +- app/assets/javascripts/controllers/home.js.coffee | 34 +-- .../controllers/license_groups.js.coffee | 14 +- .../javascripts/controllers/licenses.js.coffee | 25 ++- .../original_picture_license_groups.js.coffee | 2 +- .../original_picture_licenses.js.coffee | 2 +- .../controllers/original_pictures.js.coffee | 21 +- .../controllers/panel_pictures.js.coffee | 14 +- .../javascripts/controllers/panels.js.coffee | 31 ++- .../javascripts/controllers/pictures.js.coffee | 6 +- .../controllers/resource_pictures.js.coffee | 10 +- .../controllers/scroll_panels.js.coffee | 29 ++- .../javascripts/controllers/scrolls.js.coffee | 7 +- .../javascripts/controllers/sheet_panels.js.coffee | 29 ++- .../javascripts/controllers/sheets.js.coffee | 29 ++- .../controllers/speech_balloon_templates.js.coffee | 25 ++- .../controllers/speech_balloons.js.coffee | 20 +- .../javascripts/controllers/speeches.js.coffee | 14 +- .../javascripts/controllers/stories.js.coffee | 43 ++-- .../javascripts/controllers/story_sheets.js.coffee | 29 ++- .../controllers/system_pictures.js.coffee | 10 +- .../controllers/writing_formats.js.coffee | 23 +- app/assets/javascripts/locmare/profiler.js.coffee | 8 +- .../locmare/profiler/association.js.coffee | 10 +- .../profiler/association/belongs_to.js.coffee | 6 +- .../profiler/association/has_many.js.coffee | 6 +- .../locmare/profiler/association/has_one.js.coffee | 6 +- .../javascripts/locmare/profiler/header.js.coffee | 6 +- app/assets/javascripts/models/panel.js.coffee | 5 + app/assets/javascripts/models/sheet.js.coffee | 5 + app/assets/javascripts/models/story.js.coffee | 5 + .../javascripts/pettanr/action_filter.js.coffee | 248 +++++++++++++++------ .../javascripts/views/balloons/show.js.coffee | 8 +- app/assets/javascripts/views/comics/show.js.coffee | 10 +- .../javascripts/views/ground_colors/show.js.coffee | 8 +- .../views/ground_pictures/show.js.coffee | 8 +- .../views/panel_pictures/show.js.coffee | 8 +- app/assets/javascripts/views/panels/show.js.coffee | 10 +- .../javascripts/views/scrolls/show.js.coffee | 12 +- .../views/speech_balloons/show.js.coffee | 8 +- .../javascripts/views/speeches/show.js.coffee | 8 +- app/controllers/artists_controller.rb | 2 +- 48 files changed, 604 insertions(+), 392 deletions(-) diff --git a/app/assets/javascripts/controllers/artists.js.coffee b/app/assets/javascripts/controllers/artists.js.coffee index 3a792075..ca3317d3 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('name')) + @trigger('title', @params, @item.get('name')) show = new Pettanr.Views.Artist.Show({ item: @item, operators: @operators @@ -25,26 +25,31 @@ class Pettanr.ArtistsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new(@create) edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit(@update) - create: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', '/home/configure') - else - @not_created() + create: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() - update: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', '/home/configure') - else - @not_updated() + update: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + + post_success: (model, response) -> + @trigger('redirect', '/home/configure') + @trigger('success', model, response) + diff --git a/app/assets/javascripts/controllers/authors.js.coffee b/app/assets/javascripts/controllers/authors.js.coffee index 5299023f..01cbdc58 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('name')) + @trigger('title', @params, @item.get('name')) show = new Pettanr.Views.Author.Show({ item: @item, operators: @operators @@ -25,26 +25,31 @@ class Pettanr.AuthorsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new(@create) edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit(@update) - create: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', '/home/configure') - else - @not_created() + create: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() - update: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', '/home/configure') - else - @not_updated() + update: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + + post_success: (model, response) -> + @trigger('redirect', '/home/configure') + @trigger('success', model, response) + diff --git a/app/assets/javascripts/controllers/balloons.js.coffee b/app/assets/javascripts/controllers/balloons.js.coffee index f33d7027..3a734354 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_speech_balloon: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.Balloon.Show({ item: @item, @@ -36,9 +36,3 @@ class Pettanr.BalloonsController extends Pettanr.AppController edit: () -> - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/comic_stories.js.coffee b/app/assets/javascripts/controllers/comic_stories.js.coffee index 60c84263..1960a7a1 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_comic: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_story: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.ComicStory.Show({ item: @item, @@ -37,16 +37,29 @@ class Pettanr.ComicStoriesController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/comics.js.coffee b/app/assets/javascripts/controllers/comics.js.coffee index 0a429b1b..3d1ffc22 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_story: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('title')) + @trigger('title', @params, @item.get('title')) show = new Pettanr.Views.Comic.Show({ item: @item, operators: @operators @@ -33,26 +33,29 @@ class Pettanr.ComicsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new(@create) edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit(@update) - create: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', form.item.show_url()) - else - @not_created() + create: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() - update: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', form.item.show_url()) - else - @not_updated() + update: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/ground_colors.js.coffee b/app/assets/javascripts/controllers/ground_colors.js.coffee index ab28395a..02cc6a08 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.GroundColor.Show({ item: @item, operators: @operators @@ -36,9 +36,3 @@ class Pettanr.GroundColorsController extends Pettanr.AppController edit: () -> - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/ground_pictures.js.coffee b/app/assets/javascripts/controllers/ground_pictures.js.coffee index 9e8dcf92..7be455bb 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.GroundPicture.Show({ item: @item, operators: @operators @@ -37,9 +37,3 @@ class Pettanr.GroundPicturesController extends Pettanr.AppController edit: () -> - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/home.js.coffee b/app/assets/javascripts/controllers/home.js.coffee index cacc2233..74c444c8 100644 --- 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 - + configure: () -> view = new Pettanr.Views.Home.Configure({ el: "#pettanr", @@ -9,67 +9,67 @@ class Pettanr.HomeController extends Pettanr.AppController view.render() scrolls: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() scroll_panels: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() comics: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() comic_stories: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() stories: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() story_sheets: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() sheets: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() sheet_panels: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() panels: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() panel_pictures: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() speech_balloons: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() balloons: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() speeches: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() ground_pictures: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() ground_colors: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() resource_pictures: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() scrolls_count: () -> diff --git a/app/assets/javascripts/controllers/license_groups.js.coffee b/app/assets/javascripts/controllers/license_groups.js.coffee index a7e98f97..d30c628d 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.LicenseGroup.Show({ item: @item, operators: @operators @@ -25,16 +25,10 @@ class Pettanr.LicenseGroupsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/licenses.js.coffee b/app/assets/javascripts/controllers/licenses.js.coffee index cd428037..84752e25 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_icense_group: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_system_picture: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.License.Show({ item: @item, operators: @operators @@ -33,16 +33,27 @@ class Pettanr.LicensesController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + 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 9fd95291..ef7e767a 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() diff --git a/app/assets/javascripts/controllers/original_picture_licenses.js.coffee b/app/assets/javascripts/controllers/original_picture_licenses.js.coffee index c2d01c4f..9bc1a056 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee index 39816eb7..d9e7f84f 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() history: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.OriginalPicture.Show({ item: @item, @@ -33,8 +33,21 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController edit: () -> create: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/panel_pictures.js.coffee b/app/assets/javascripts/controllers/panel_pictures.js.coffee index c083c896..1ecc26f0 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.PanelPicture.Show({ item: @item, operators: @operators @@ -36,9 +36,3 @@ class Pettanr.PanelPicturesController extends Pettanr.AppController edit: () -> - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee index de3b2e0b..ffea9840 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_scroll: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_sheet: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_speech_balloon_template: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item = new Pettanr.Panel.WithElements({id: @item.get('id')}) # retake panel for 'with_elements' mode @item.fetch({cache: false}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.Panel.Show({ panel: @item, operators: @operators, @@ -44,12 +44,12 @@ class Pettanr.PanelsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @set_new() @editor() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @set_model() panel = new Pettanr.Panel({id: @params['id']}) @item = panel.with_elements() @@ -61,8 +61,21 @@ class Pettanr.PanelsController extends Pettanr.AppController editor: () -> create: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/pictures.js.coffee b/app/assets/javascripts/controllers/pictures.js.coffee index ee4066fc..8d81b95d 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_artist: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.Picture.Show({ item: @item, diff --git a/app/assets/javascripts/controllers/resource_pictures.js.coffee b/app/assets/javascripts/controllers/resource_pictures.js.coffee index a39e24f3..98c8f74f 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_artist: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_license_group: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_license: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.ResourcePicture.Show({ item: @item, diff --git a/app/assets/javascripts/controllers/scroll_panels.js.coffee b/app/assets/javascripts/controllers/scroll_panels.js.coffee index 946f47b0..a4329d39 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_scroll: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.ScrollPanel.Show({ item: @item, @@ -41,16 +41,29 @@ class Pettanr.ScrollPanelsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/scrolls.js.coffee b/app/assets/javascripts/controllers/scrolls.js.coffee index cd05924a..09068d40 100644 --- 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() create: () -> - @form.item.overwrite(@operators) + @form.item.overwrite({operators: @operators}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() update: () -> - @form.item.overwrite(@operators) + @form.item.overwrite({operators: @operators}) @listenTo(@form, 'success', @post_success) @listenTo(@form, 'fail', @post_fail) @form.save() @@ -71,6 +71,3 @@ class Pettanr.ScrollsController extends Pettanr.AppController @listenTo(@item, 'destroy:fail', @destroy_fail) @item.destroy() - redirected: (view) -> - @trigger('ready', view) - diff --git a/app/assets/javascripts/controllers/sheet_panels.js.coffee b/app/assets/javascripts/controllers/sheet_panels.js.coffee index 3291f88a..74d673fd 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_sheet: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.SheetPanel.Show({ item: @item, @@ -37,16 +37,29 @@ class Pettanr.SheetPanelsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/sheets.js.coffee b/app/assets/javascripts/controllers/sheets.js.coffee index e9c02d1a..59e1a8e6 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_story: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.Sheet.Show({ item: @item, operators: @operators @@ -37,16 +37,29 @@ class Pettanr.SheetsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee index 2ab81b70..72a9be84 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_system_picture: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.SpeechBalloonTemplate.Show({ item: @item, operators: @operators @@ -33,16 +33,27 @@ class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/speech_balloons.js.coffee b/app/assets/javascripts/controllers/speech_balloons.js.coffee index 02876945..0207dea5 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_panel: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_speech_balloon_template: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.SpeechBalloon.Show({ item: @item, operators: @operators @@ -37,16 +37,10 @@ class Pettanr.SpeechBalloonsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/speeches.js.coffee b/app/assets/javascripts/controllers/speeches.js.coffee index b6dab9ce..ff659df6 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_speech_balloon: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.Speech.Show({ item: @item, @@ -36,9 +36,3 @@ class Pettanr.SpeechesController extends Pettanr.AppController edit: () -> - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/stories.js.coffee b/app/assets/javascripts/controllers/stories.js.coffee index 1a82128a..d4fc2c50 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_comic: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_sheet: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('title')) + @trigger('title', @params, @item.get('title')) show = new Pettanr.Views.Story.Show({ item: @item, operators: @operators @@ -37,26 +37,29 @@ class Pettanr.StoriesController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new(@create) edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit(@update) - create: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', form.item.show_url()) - else - @not_created() + create: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() - update: (form) -> - form.item.overwrite(@operators) - if form.save() - @trigger('redirect', form.item.show_url()) - else - @not_updated() + update: () -> + @form.item.overwrite({operators: @operators}) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/story_sheets.js.coffee b/app/assets/javascripts/controllers/story_sheets.js.coffee index 4d2b7488..a460b622 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_author: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_story: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_sheet: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.StorySheet.Show({ item: @item, @@ -37,16 +37,29 @@ class Pettanr.StorySheetsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @form.item.overwrite(@operators) + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/controllers/system_pictures.js.coffee b/app/assets/javascripts/controllers/system_pictures.js.coffee index c47ddba0..473b745e 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> - @trigger('retitle', @params) + @trigger('title', @params) @item.fetch({cache: true}).done => show = new Pettanr.Views.SystemPicture.Show({ item: @item, @@ -24,9 +24,3 @@ class Pettanr.SystemPicturesController extends Pettanr.AppController count: () -> - create: () -> - - update: () -> - - destroy: () -> - diff --git a/app/assets/javascripts/controllers/writing_formats.js.coffee b/app/assets/javascripts/controllers/writing_formats.js.coffee index 067990e2..fc4370a8 100644 --- 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 index: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() by_system_picture: () -> - @trigger('retitle', @params) + @trigger('title', @params) @filer_list() show_html: () -> @item.fetch({cache: true}).done => - @trigger('retitle', @params, @item.get('caption')) + @trigger('title', @params, @item.get('caption')) show = new Pettanr.Views.WritingFormat.Show({ item: @item, operators: @operators @@ -29,16 +29,27 @@ class Pettanr.WritingFormatsController extends Pettanr.AppController count: () -> new: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_new() edit: () -> - @trigger('retitle', @params) + @trigger('title', @params) @form_edit() create: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() update: () -> + @listenTo(@form, 'success', @post_success) + @listenTo(@form, 'fail', @post_fail) + @form.save() destroy: () -> - + @set_show() + @item.fetch({cache: true}).done => + @listenTo(@item, 'destroy:success', @destroy_success) + @listenTo(@item, 'destroy:fail', @destroy_fail) + @item.destroy() + diff --git a/app/assets/javascripts/locmare/profiler.js.coffee b/app/assets/javascripts/locmare/profiler.js.coffee index a8e4c654..5568ef87 100644 --- 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}) @columns = new Locmare.ProfilerModule.Column({profiler: this}) @associations = new Locmare.ProfilerModule.Association({'profiler': this, association_manifest: @profiler_manifest.associations}) - @listenTo(@header, 'navigate', @navigate) - @listenTo(@associations, 'navigate', @navigate) + @listenTo(@header, 'http_get', @http_get) + @listenTo(@associations, 'http_get', @http_get) render: () -> this.$el.html('') @@ -31,8 +31,8 @@ class Locmare.Profiler extends Backbone.View image_dir: () -> '/images/' - navigate: (url) -> - @trigger('navigate', url) + http_get: (url) -> + @trigger('http_get', url) class Locmare.ProfilerModule diff --git a/app/assets/javascripts/locmare/profiler/association.js.coffee b/app/assets/javascripts/locmare/profiler/association.js.coffee index 2d121740..5737005d 100644 --- 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'}) this.$el.append(caption.render().el) _.each @belongs_to, (f) => - @listenTo(f, 'navigate', @navigate) + @listenTo(f, 'http_get', @http_get) this.$el.append(f.render().el) caption = new Tag.Div({class_name: 'caption', content: 'has_many'}) this.$el.append(caption.render().el) _.each @has_many, (f) => - @listenTo(f, 'navigate', @navigate) + @listenTo(f, 'http_get', @http_get) this.$el.append(f.render().el) caption = new Tag.Div({class_name: 'caption', content: 'has_one'}) this.$el.append(caption.render().el) _.each @has_one, (f) => - @listenTo(f, 'navigate', @navigate) + @listenTo(f, 'http_get', @http_get) this.$el.append(f.render().el) this @@ -39,8 +39,8 @@ class Locmare.ProfilerModule.Association extends Backbone.View model_manifest: () -> Manifest.manifest().models[@profiler.item_name] - navigate: (url) -> - @trigger('navigate', url) + http_get: (url) -> + @trigger('http_get', url) class Locmare.ProfilerModule.AssociationModule 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 38213626..4813f60a 100644 --- 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, operators: @profiler().operators }) - @listenTo(@filer, 'navigate', @navigate) + @listenTo(@filer, 'http_get', @http_get) @render() render: () -> @@ -39,6 +39,6 @@ class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Backbone.View profiler: () -> @association.profiler - navigate: (url) -> - @trigger('navigate', url) + http_get: (url) -> + @trigger('http_get', url) 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 eb3d129c..919a74a6 100644 --- 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, operators: @profiler().operators }) - @listenTo(@filer, 'navigate', @navigate) + @listenTo(@filer, 'http_get', @http_get) @render() ) @@ -35,6 +35,6 @@ class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View profiler: () -> @association.profiler - navigate: (url) -> - @trigger('navigate', url) + http_get: (url) -> + @trigger('http_get', url) 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 d9b9f8c8..087d18aa 100644 --- 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, operators: @profiler().operators }) - @listenTo(@filer, 'navigate', @navigate) + @listenTo(@filer, 'http_get', @http_get) @render() ) @@ -37,6 +37,6 @@ class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View profiler: () -> @association.profiler - navigate: (url) -> - @trigger('navigate', url) + http_get: (url) -> + @trigger('http_get', url) diff --git a/app/assets/javascripts/locmare/profiler/header.js.coffee b/app/assets/javascripts/locmare/profiler/header.js.coffee index 96388e5b..8db142b1 100644 --- 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, operators: @profiler.operators }) - @listenTo(@filer, 'navigate', @navigate) + @listenTo(@filer, 'http_get', @http_get) render: () -> this.$el.html(@filer.el) this - navigate: (url) -> - @trigger('navigate', url) + http_get: (url) -> + @trigger('http_get', url) diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee index c3479411..834bf3f2 100644 --- 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: () -> new Pettanr.Panel.WithElements({id: @get('id')}) + overwrite: (options) -> + operators = options.operators + return false if not operators.author + @set('author_id', operators.author.id) + is_visible: (operators) -> switch super(operators) when null # super return diff --git a/app/assets/javascripts/models/sheet.js.coffee b/app/assets/javascripts/models/sheet.js.coffee index 1c377ad8..1be6aee3 100644 --- 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: () -> new Pettanr.Author({id: @get('author_id')}) + overwrite: (options) -> + operators = options.operators + return false if not operators.author + @set('author_id', operators.author.id) + is_visible: (operators) -> switch super(operators) when null diff --git a/app/assets/javascripts/models/story.js.coffee b/app/assets/javascripts/models/story.js.coffee index df372475..6d5482f1 100644 --- 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: () -> new Pettanr.Author({id: @get('author_id')}) + overwrite: (options) -> + operators = options.operators + return false if not operators.author + @set('author_id', operators.author.id) + is_visible: (operators) -> switch super(operators) when null diff --git a/app/assets/javascripts/pettanr/action_filter.js.coffee b/app/assets/javascripts/pettanr/action_filter.js.coffee index 1b2cac42..141fcb2a 100644 --- 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 @suply_default: (reader, resource_reader, user, author) -> { - reader: _.union(default_reader_filters, reader), - resource_reader: _.union(default_resource_reader_filters, resource_reader), - user: _.union(default_user_filters, user), - author: _.union(default_author_filters, author) + reader: _.union(@default_reader_filters, reader), + resource_reader: _.union(@default_resource_reader_filters, resource_reader), + user: _.union(@default_user_filters, user), + author: _.union(@default_author_filters, author) } + @default_reader_filters = ['index', 'show'] + @default_resource_reader_filters = [] + @default_user_filters = ['new', 'create', 'edit', 'update', 'destroy'] + @default_author_filters = ['new', 'create', 'edit', 'update', 'destroy'] + @sns_filters: () -> default_reader_filters = ['index', 'show'] default_resource_reader_filters = [] default_user_filters = ['new', 'create', 'edit', 'update', 'destroy'] default_author_filters = ['new', 'create', 'edit', 'update', 'destroy'] { - 'folders': { - reader: _.union(default_reader_filters, ['root', 'watch']), - resource_reader: _.union(default_resource_reader_filters, []), - user: _.union(default_user_filters, []), - author: _.union(default_author_filters, []) - }, - 'scrolls': { - reader: _.union(default_reader_filters, ['play', 'by_panel', 'by_author']), - resource_reader: _.union(default_resource_reader_filters, []), - user: _.union(default_user_filters, []), - author: _.union(default_author_filters, []) - }, - scroll_panels: { - reader: _.union(default_reader_filters, ['by_panel', 'by_scroll', 'by_author']), - resource_reader: _.union(default_resource_reader_filters, []), - user: _.union(default_user_filters, []), - author: _.union(default_author_filters, []) - }, - comics: { - }, - comic_stories: { - }, - stories: { - }, - story_sheets: { - }, - sheets: { - }, - sheet_panels: { - }, - panels: { - }, - panel_pictures: { - }, - speech_balloons: { - }, - speeches: { - }, - balloons: { - }, - ground_pictures: { - }, - ground_colors: { - }, - original_pictures: { - }, - pictures: { - }, - resource_pictures: { - }, - speech_balloon_templates: { - }, - writing_formats: { - }, - license_groups: { - }, - licenses: { - }, - authors: { - }, - artists: { - }, - system_pictures: { - }, - home: { - }, + folders: @suply_default( + ['root', 'watch'], + [], + [], + [] + ), + scrolls: @suply_default( + ['play', 'by_panel', 'by_author'], + [], + [], + [] + ), + scroll_panels: @suply_default( + ['by_panel', 'by_scroll', 'by_author'], + [], + [], + [] + ), + comics: @suply_default( + ['play', 'by_story', 'by_author'], + [], + [], + [] + ), + comic_stories: @suply_default( + ['by_story', 'by_comic', 'by_author'], + [], + [], + [] + ), + stories: @suply_default( + ['play', 'by_comic', 'by_sheet', 'by_author'], + [], + [], + [] + ), + story_sheets: @suply_default( + ['by_story', 'by_sheet', 'by_author'], + [], + [], + [] + ), + sheets: @suply_default( + ['play', 'by_story', 'by_panel', 'by_author'], + [], + [], + [] + ), + sheet_panels: @suply_default( + ['by_panel', 'by_sheet', 'by_author'], + [], + [], + [] + ), + panels: @suply_default( + ['by_scroll', 'by_sheet', 'by_author', 'by_speech_balloon_template'], + [], + [], + [] + ), + panel_pictures: @suply_default( + ['by_panel', 'by_author'], + [], + [], + [] + ), + speech_balloons: @suply_default( + ['by_panel', 'by_author', 'by_speech_balloon_template'], + [], + [], + [] + ), + speeches: @suply_default( + ['by_author', 'by_speech_balloon', 'by_speech_balloon_template', 'by_writing_format'], + [], + [], + [] + ), + balloons: @suply_default( + [], + [], + [], + [] + ), + ground_pictures: @suply_default( + ['by_panel', 'by_author'], + [], + [], + [] + ), + ground_colors: @suply_default( + ['by_panel', 'by_author'], + [], + [], + [] + ), + original_pictures: @suply_default( + ['history'], + [], + [], + [] + ), + pictures: @suply_default( + ['credit', 'search'], + [], + [], + [] + ), + resource_pictures: @suply_default( + ['credit', 'by_original_picture', 'by_license_group', 'by_license', 'by_artist'], + [], + [], + [] + ), + speech_balloon_templates: @suply_default( + ['by_panel', 'by_system_picture'], + [], + [], + [] + ), + writing_formats: @suply_default( + ['by_system_picture'], + [], + [], + [] + ), + license_groups: @suply_default( + ['by_resource_picture'], + [], + [], + [] + ), + licenses: @suply_default( + ['by_license_group', 'by_system_picture'], + [], + [], + [] + ), + authors: @suply_default( + [], + [], + [], + [] + ), + artists: @suply_default( + [], + [], + [], + [] + ), + system_pictures: @suply_default( + [], + [], + [], + [] + ), + home: @suply_default( + [ + 'profile', 'configure', 'create_token', 'delete_token', + 'scrolls', 'scroll_panels', 'comics', 'comic_stories', 'stories', 'story_sheets', 'sheets', 'sheet_panels', + 'panels', 'panel_pictures', 'speech_balloons', 'balloons', 'speeches', 'ground_pictures', 'ground_colors' + ], + [ + 'scrolls', 'scroll_panels', 'comics', 'comic_stories', 'stories', 'story_sheets', 'sheets', 'sheet_panels', + 'panels', 'panel_pictures', 'speech_balloons', 'balloons', 'speeches', 'ground_pictures', 'ground_colors' + ], + [], + [] + ), } @blog_filters: () -> diff --git a/app/assets/javascripts/views/balloons/show.js.coffee b/app/assets/javascripts/views/balloons/show.js.coffee index 197fc097..246054c3 100644 --- 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) click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_author: () -> - @trigger('navigate', @panel.author().show_url()) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - @trigger('navigate', item.show_url()) + @trigger('http_get', item.show_url()) diff --git a/app/assets/javascripts/views/comics/show.js.coffee b/app/assets/javascripts/views/comics/show.js.coffee index dad6329a..b7c95136 100644 --- 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 click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_author: () -> - @trigger('navigate', @panel.author().show_url()) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_edit: () -> - @trigger('navigate', @item.edit_url()) + @trigger('http_get', @item.edit_url()) click_destroy: () -> - @trigger('navigate', @item.destroy_url()) + @trigger('http_get', @item.destroy_url()) diff --git a/app/assets/javascripts/views/ground_colors/show.js.coffee b/app/assets/javascripts/views/ground_colors/show.js.coffee index 90eaeb81..5ff3fbb0 100644 --- 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) click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_author: () -> - @trigger('navigate', @panel.author().show_url()) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - @trigger('navigate', item.show_url()) + @trigger('http_get', item.show_url()) diff --git a/app/assets/javascripts/views/ground_pictures/show.js.coffee b/app/assets/javascripts/views/ground_pictures/show.js.coffee index d3e62e5b..e4b193b5 100644 --- 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) click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_author: () -> - @trigger('navigate', @panel.author().show_url()) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - @trigger('navigate', item.show_url()) + @trigger('http_get', item.show_url()) diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee index e2e2b663..e4b32b92 100644 --- 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) click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_author: () -> - @trigger('navigate', @panel.author().show_url()) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - @trigger('navigate', item.show_url()) + @trigger('http_get', item.show_url()) diff --git a/app/assets/javascripts/views/panels/show.js.coffee b/app/assets/javascripts/views/panels/show.js.coffee index bd90eb3a..9753d4cd 100644 --- 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 click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_author: () -> - @trigger('navigate', @panel.author().show_url()) + @trigger('http_get', @panel.author().show_url()) click_edit: () -> - @trigger('navigate', @panel.edit_url()) + @trigger('http_get', @panel.edit_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - @trigger('navigate', item.show_url()) + @trigger('http_get', item.show_url()) class Pettanr.Views.Panel.ShowModule class Pettanr.Views.Panel.ShowModule.Header extends Pettanr.Views.Show.Header diff --git a/app/assets/javascripts/views/scrolls/show.js.coffee b/app/assets/javascripts/views/scrolls/show.js.coffee index 7be4a15a..1507f460 100644 --- 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 click_show: () -> - @trigger('navigate', @item.show_url()) + @trigger('http_get', @item.show_url()) click_play: () -> - @trigger('navigate', @item.play_url()) + @trigger('http_get', @item.play_url()) click_prof: () -> - @trigger('navigate', @item.prof_url()) + @trigger('http_get', @item.prof_url()) click_author: () -> - @trigger('navigate', @item.author().show_url()) + @trigger('http_get', @item.author().show_url()) click_edit: () -> - @trigger('navigate', @item.edit_url()) + @trigger('http_get', @item.edit_url()) click_destroy: () -> - @trigger('navigate', @item.destroy_url()) + @trigger('http_get', @item.destroy_url()) diff --git a/app/assets/javascripts/views/speech_balloons/show.js.coffee b/app/assets/javascripts/views/speech_balloons/show.js.coffee index 334538d5..a2fe35eb 100644 --- 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) click_show: () -> - window.router.navigate(@item.show_url(), true) + @trigger('http_get', @item.show_url()) click_author: () -> - window.router.navigate(@panel.author().show_url(), true) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - window.router.navigate(@item.prof_url(), true) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - window.router.navigate(item.show_url(), true) + @trigger('http_get', item.show_url()) diff --git a/app/assets/javascripts/views/speeches/show.js.coffee b/app/assets/javascripts/views/speeches/show.js.coffee index c75897a0..7bb259ef 100644 --- 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) click_show: () -> - window.router.navigate(@item.show_url(), true) + @trigger('http_get', @item.show_url()) click_author: () -> - window.router.navigate(@panel.author().show_url(), true) + @trigger('http_get', @panel.author().show_url()) click_prof: () -> - window.router.navigate(@item.prof_url(), true) + @trigger('http_get', @item.prof_url()) click_credit_icon: (item) -> - window.router.navigate(item.show_url(), true) + @trigger('http_get', item.show_url()) diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb index 83257f2b..492e4ced 100644 --- 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] -- 2.11.0