From: yasushiito Date: Tue, 23 Sep 2014 01:06:49 +0000 (+0900) Subject: js viewer worked X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=c45c5a09d02072bf526c03a3fec185a1963118aa js viewer worked --- diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js index b70285b0..07fee19a 100644 --- a/app/assets/javascripts/ap.js +++ b/app/assets/javascripts/ap.js @@ -6,7 +6,7 @@ // //= require jquery //= require jquery_ujs -//= require jquery.ui.slider +//= require jquery-ui //require jquery.validate //require additional-methods //require jquery.validate.localization/messages_ja diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee index cee0c362..094afbdc 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee @@ -1,7 +1,4 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.Default extends Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.Base - events: { - 'click .face': 'show' - } initialize: (options) -> super(options) m = Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule @@ -10,6 +7,9 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo render: () -> this.$el.html(@renderer().render().el) + @delegateEvents({ + 'click .face': 'show' + }) this show: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee index 17f09894..b8cf6c75 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/base.js.coffee @@ -1,8 +1,5 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.IconItemColumnModule.Base extends Backbone.View tagName: 'div' - events: { - 'click .face': 'profiler' - } initialize: (options) -> @file_item = options.file_item diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee index ec7f4065..3109c017 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee @@ -15,6 +15,9 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.IconItemColum content: icon.render().el }) this.$el.html(a.render().el) + @delegateEvents({ + 'click .face': 'profiler' + }) this path_name: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee index 8aad184d..23a22a34 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee @@ -1,7 +1,4 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.Default extends Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.Base - events: { - 'click .face': 'show' - } initialize: (options) -> super(options) m = Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule @@ -10,6 +7,9 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol render: () -> this.$el.html(@renderer().render().el) + @delegateEvents({ + 'click .face': 'show' + }) this show: () -> diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee index 4d5ce9e9..9983e7e6 100644 --- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee +++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee @@ -51,7 +51,7 @@ class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormMod else {} list = Locmare.ListGroup.list(resource_model_name, resource_list_name) - list.open(@form().operators, params, 'my_action', {}, (page_status) -> + list.open(@form().operators, params, list.action(), {}, (page_status) -> members = _.map list.models, (member) -> [member.get(caption_name), member.get('id')] cb(members) diff --git a/app/assets/javascripts/locmare/list_group/list/base.js.coffee b/app/assets/javascripts/locmare/list_group/list/base.js.coffee index 77e0e047..0d8daf92 100644 --- a/app/assets/javascripts/locmare/list_group/list/base.js.coffee +++ b/app/assets/javascripts/locmare/list_group/list/base.js.coffee @@ -30,22 +30,17 @@ class Locmare.ListGroupModule.Base extends Backbone.Collection count: (operators, params, action) -> new Pettanr.CounterModel({}, {url: '/' + action.counter_url(params)}) - open: (operators, params, _action, options, cb) -> + open: (operators, params, action, options, cb) -> page = @page_number(params['page']) page_size = @page_size(params['page_size']) - controller = Manifest.manifest().controllers[@table_name] - an = if @list_name == 'select_items' #hogeee - 'index' - else - @list_name - action = controller.actions[an] #offset = (page - 1) * page_size #items = @items(operators, params, offset, page_size, action) @url = '/' + action.url(params) + @model = Manifest.item_name_to_model action.item_name _this = this counter = new Locmare.ListGroupModule.Counter({}, {url: '/' + action.counter_url(params)}) counter.fetch().done -> - page_status = new Locmare.ListGroupModule.PageStatus(page, page_size, counter.count()) + page_status = new Locmare.ListGroupModule.PageStatus(page, page_size, counter.count(), params) _this.fetch(options).done -> #_this.boost(items) cb(page_status) @@ -59,6 +54,6 @@ class Locmare.ListGroupModule.Counter extends Backbone.Model class Locmare.ListGroupModule.PageStatus - constructor: (@current_page, @per_page, @count) -> + constructor: (@current_page, @per_page, @count, @params) -> @window_size = 3 diff --git a/app/assets/javascripts/locmare/list_group/list/system_resource.js.coffee b/app/assets/javascripts/locmare/list_group/list/system_resource.js.coffee index b8b85507..8241c0a2 100644 --- a/app/assets/javascripts/locmare/list_group/list/system_resource.js.coffee +++ b/app/assets/javascripts/locmare/list_group/list/system_resource.js.coffee @@ -1,2 +1,10 @@ class Locmare.ListGroupModule.SystemResourceList extends Locmare.ListGroupModule.Base + action: () -> + controller = Manifest.manifest().controllers[@table_name] + an = if @list_name == 'select_items' #hogeee + 'index' + else + @list_name + controller.actions[an] + 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 c7397879..99b22e6a 100644 --- a/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/belongs_to.js.coffee @@ -10,7 +10,7 @@ class Locmare.ProfilerModule.AssociationModule.BelongsTo extends Backbone.View m.fetch().done -> _this.filer = new Locmare.Filer({ item_name: _this.parent_model().item_name(), - items: m, + items: [m], pager: null, operators: _this.profiler().operators }) 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 913d6b7c..c0185a4d 100644 --- a/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/has_many.js.coffee @@ -4,17 +4,24 @@ class Locmare.ProfilerModule.AssociationModule.HasMany extends Backbone.View initialize: (options) -> @association = options.association @has_many_manifest = options.has_many_manifest - c = @has_many_manifest.list_options(@item().get('id')) - m = new Pettanr.FilerCollection({}, c) - @filer = new Locmare.Filer({ - item_name: @has_many_model().item_name(), - collection: m, - pager: @pager, - operators: @profiler().operators - }) + @filer = null + controller = Manifest.manifest().controllers[@has_many_manifest.table_name] + action = controller.actions[@has_many_manifest.list_name] + @list = Locmare.ListGroup.list(@has_many_manifest.item_name, @has_many_manifest.list_name) + params = {id: @item().get('id'), page: 1, page_size: 3} + _this = this + @list.open(@profiler().operators, params, action, {}, (page_status) -> + _this.filer = new Locmare.Filer({ + item_name: _this.has_many_model().item_name(), + items: _this.list.models, + pager: _this.pager, + operators: _this.profiler().operators + }) + _this.render() + ) render: () -> - this.$el.html(@filer.el) + this.$el.html(@filer.el) if @filer this item: () -> 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 7094d714..8ddd7fb3 100644 --- a/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee +++ b/app/assets/javascripts/locmare/profiler/association/has_one.js.coffee @@ -5,14 +5,20 @@ class Locmare.ProfilerModule.AssociationModule.HasOne extends Backbone.View @association = options.association @has_one_manifest = options.has_one_manifest @filer = null - c = @has_one_manifest.list_options(@item().get('id')) - m = new Pettanr.FilerCollection({}, c) - @filer = new Locmare.Filer({ - item_name: @has_one_model().item_name(), - collection: m, - pager: @pager, - operators: @profiler().operators - }) + controller = Manifest.manifest().controllers[@has_one_manifest.table_name] + action = controller.actions[@has_one_manifest.list_name] + @list = Locmare.ListGroup.list(@has_one_manifest.item_name, @has_one_manifest.list_name) + params = {id: @item().get('id')} + _this = this + @list.open(@profiler().operators, params, action, {}, (page_status) -> + _this.filer = new Locmare.Filer({ + item_name: _this.has_one_model().item_name(), + items: _this.list.models, + pager: _this.pager, + operators: _this.profiler().operators + }) + _this.render() + ) render: () -> this.$el.html('') diff --git a/app/assets/javascripts/locmare/profiler/header.js.coffee b/app/assets/javascripts/locmare/profiler/header.js.coffee index ddadaf4b..5e7bacd3 100644 --- a/app/assets/javascripts/locmare/profiler/header.js.coffee +++ b/app/assets/javascripts/locmare/profiler/header.js.coffee @@ -5,7 +5,7 @@ class Locmare.ProfilerModule.Header extends Backbone.View @profiler = options.profiler @filer = new Locmare.Filer({ item_name: @profiler.item_name, - collection: @profiler.item, + items: [@profiler.item], pager: @pager, operators: @profiler.operators }) diff --git a/app/assets/javascripts/manifest/controller/action/list.js.coffee b/app/assets/javascripts/manifest/controller/action/list.js.coffee index 0620b378..55226df7 100644 --- a/app/assets/javascripts/manifest/controller/action/list.js.coffee +++ b/app/assets/javascripts/manifest/controller/action/list.js.coffee @@ -7,13 +7,13 @@ class Manifest.ControllerModule.ActionModule.ActionList extends Manifest.Control init: () -> super() @list_name = @args.list_name - @counter_name = if not @args.counter_name + @counter_name = if @args.counter_name + @args.counter_name + else if @name == 'index' 'count' else - 'count_' - else - @args.counter_name + 'count_' + @name counter_url: (params) -> @encode_url(@counter_name, params) diff --git a/app/views/top/index.html.erb b/app/views/top/index.html.erb index b8484083..c910ab47 100644 --- a/app/views/top/index.html.erb +++ b/app/views/top/index.html.erb @@ -83,17 +83,6 @@ 'empty' - - - -