js viewer worked

diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js
index b70285b..07fee19 100644 (file)
--- a/app/assets/javascripts/ap.js
+++ b/app/assets/javascripts/ap.js
@@ -6,7 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
 //
 //= require jquery
 //= require jquery_ujs

-//= require jquery.ui.slider
+//= require jquery-ui

 //require jquery.validate
 //require additional-methods
 //require jquery.validate.localization/messages_ja
 //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 cee0c36..094afbd 100644 (file)
--- 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\r
 class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.Default extends Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.Base\r

-  events: {\r
-    'click .face': 'show'\r
-  }\r

   initialize: (options) ->\r
     super(options)\r
     m = Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule\r
   initialize: (options) ->\r
     super(options)\r
     m = Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemColumnModule.DefaultModule\r


@@ -10,6 +7,9 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo
   \r
   render: () ->\r
     this.$el.html(@renderer().render().el)\r
   \r
   render: () ->\r
     this.$el.html(@renderer().render().el)\r

+    @delegateEvents({\r
+      'click .face': 'show'\r
+    })\r

     this\r
   \r
   show: () ->\r
     this\r
   \r
   show: () ->\r

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 17f0989..b8cf6c7 100644 (file)
--- 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\r
   tagName: 'div'\r
 class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.IconItemColumnModule.Base extends Backbone.View\r
   tagName: 'div'\r

-  events: {\r
-    'click .face': 'profiler'\r
-  }\r

   \r
   initialize: (options) ->\r
     @file_item = options.file_item\r
   \r
   initialize: (options) ->\r
     @file_item = options.file_item\r

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 ec7f406..3109c01 100644 (file)
--- 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\r
     })\r
     this.$el.html(a.render().el)\r
       content: icon.render().el\r
     })\r
     this.$el.html(a.render().el)\r

+    @delegateEvents({\r
+      'click .face': 'profiler'\r
+    })\r

     this\r
   \r
   path_name: () ->\r
     this\r
   \r
   path_name: () ->\r

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 8aad184..23a22a3 100644 (file)
--- 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\r
 class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.Default extends Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.Base\r

-  events: {\r
-    'click .face': 'show'\r
-  }\r

   initialize: (options) ->\r
     super(options)\r
     m = Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule\r
   initialize: (options) ->\r
     super(options)\r
     m = Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemColumnModule.DefaultModule\r


@@ -10,6 +7,9 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
   \r
   render: () ->\r
     this.$el.html(@renderer().render().el)\r
   \r
   render: () ->\r
     this.$el.html(@renderer().render().el)\r

+    @delegateEvents({\r
+      'click .face': 'show'\r
+    })\r

     this\r
   \r
   show: () ->\r
     this\r
   \r
   show: () ->\r

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 4d5ce9e..9983e7e 100644 (file)
--- 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\r
         {}\r
       list = Locmare.ListGroup.list(resource_model_name, resource_list_name)\r
       else\r
         {}\r
       list = Locmare.ListGroup.list(resource_model_name, resource_list_name)\r

-      list.open(@form().operators, params, 'my_action', {}, (page_status) ->\r
+      list.open(@form().operators, params, list.action(), {}, (page_status) ->\r

         members = _.map list.models, (member) ->\r
           [member.get(caption_name), member.get('id')]\r
         cb(members)\r
         members = _.map list.models, (member) ->\r
           [member.get(caption_name), member.get('id')]\r
         cb(members)\r

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 77e0e04..0d8daf9 100644 (file)
--- 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) ->\r
     new Pettanr.CounterModel({}, {url: '/' + action.counter_url(params)})\r
   \r
   count: (operators, params, action) ->\r
     new Pettanr.CounterModel({}, {url: '/' + action.counter_url(params)})\r
   \r

-  open: (operators, params, _action, options, cb) ->\r
+  open: (operators, params, action, options, cb) ->\r

     page = @page_number(params['page']) \r
     page_size = @page_size(params['page_size'])\r
     page = @page_number(params['page']) \r
     page_size = @page_size(params['page_size'])\r

-    controller = Manifest.manifest().controllers[@table_name]\r
-    an = if @list_name == 'select_items'  #hogeee\r
-      'index'\r
-    else\r
-      @list_name\r
-    action = controller.actions[an]\r

     #offset = (page - 1) * page_size\r
     #items = @items(operators, params, offset, page_size, action)\r
     @url = '/' + action.url(params)\r
     #offset = (page - 1) * page_size\r
     #items = @items(operators, params, offset, page_size, action)\r
     @url = '/' + action.url(params)\r

+    @model = Manifest.item_name_to_model action.item_name\r

     _this = this\r
     counter = new Locmare.ListGroupModule.Counter({}, {url: '/' + action.counter_url(params)})\r
     counter.fetch().done ->\r
     _this = this\r
     counter = new Locmare.ListGroupModule.Counter({}, {url: '/' + action.counter_url(params)})\r
     counter.fetch().done ->\r

-      page_status = new Locmare.ListGroupModule.PageStatus(page, page_size, counter.count())\r
+      page_status = new Locmare.ListGroupModule.PageStatus(page, page_size, counter.count(), params)\r

       _this.fetch(options).done ->\r
         #_this.boost(items)\r
         cb(page_status)\r
       _this.fetch(options).done ->\r
         #_this.boost(items)\r
         cb(page_status)\r


@@ -59,6 +54,6 @@ class Locmare.ListGroupModule.Counter extends Backbone.Model
   \r
 class Locmare.ListGroupModule.PageStatus\r
   \r
   \r
 class Locmare.ListGroupModule.PageStatus\r
   \r

-  constructor: (@current_page, @per_page, @count) ->\r
+  constructor: (@current_page, @per_page, @count, @params) ->\r

     @window_size = 3\r
   \r
     @window_size = 3\r
   \r

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 b8b8550..8241c0a 100644 (file)
--- 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\r
   \r
 class Locmare.ListGroupModule.SystemResourceList extends Locmare.ListGroupModule.Base\r
   \r

+  action: () ->\r
+    controller = Manifest.manifest().controllers[@table_name]\r
+    an = if @list_name == 'select_items'  #hogeee\r
+      'index'\r
+    else\r
+      @list_name\r
+    controller.actions[an]\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 c739787..99b22e6 100644 (file)
--- 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 ->\r
       _this.filer = new Locmare.Filer({\r
         item_name: _this.parent_model().item_name(), \r
     m.fetch().done ->\r
       _this.filer = new Locmare.Filer({\r
         item_name: _this.parent_model().item_name(), \r

-        items: m, \r
+        items: [m], \r

         pager: null, \r
         operators: _this.profiler().operators\r
       })\r
         pager: null, \r
         operators: _this.profiler().operators\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 913d6b7..c0185a4 100644 (file)
--- 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) ->\r
     @association = options.association\r
     @has_many_manifest = options.has_many_manifest\r
   initialize: (options) ->\r
     @association = options.association\r
     @has_many_manifest = options.has_many_manifest\r

-    c = @has_many_manifest.list_options(@item().get('id'))\r
-    m = new Pettanr.FilerCollection({}, c)\r
-    @filer = new Locmare.Filer({\r
-      item_name: @has_many_model().item_name(), \r
-      collection: m, \r
-      pager: @pager, \r
-      operators: @profiler().operators\r
-    })\r
+    @filer = null\r
+    controller = Manifest.manifest().controllers[@has_many_manifest.table_name]\r
+    action = controller.actions[@has_many_manifest.list_name]\r
+    @list = Locmare.ListGroup.list(@has_many_manifest.item_name, @has_many_manifest.list_name)\r
+    params = {id: @item().get('id'), page: 1, page_size: 3}\r
+    _this = this\r
+    @list.open(@profiler().operators, params, action, {}, (page_status) ->\r
+      _this.filer = new Locmare.Filer({\r
+        item_name: _this.has_many_model().item_name(), \r
+        items: _this.list.models, \r
+        pager: _this.pager, \r
+        operators: _this.profiler().operators\r
+      })\r
+      _this.render()\r
+    )\r

   \r
   render: () ->\r
   \r
   render: () ->\r

-    this.$el.html(@filer.el)\r
+    this.$el.html(@filer.el) if @filer\r

     this\r
   \r
   item: () ->\r
     this\r
   \r
   item: () ->\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 7094d71..8ddd7fb 100644 (file)
--- 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\r
     @has_one_manifest = options.has_one_manifest\r
     @filer = null\r
     @association = options.association\r
     @has_one_manifest = options.has_one_manifest\r
     @filer = null\r

-    c = @has_one_manifest.list_options(@item().get('id'))\r
-    m = new Pettanr.FilerCollection({}, c)\r
-    @filer = new Locmare.Filer({\r
-      item_name: @has_one_model().item_name(), \r
-      collection: m, \r
-      pager: @pager, \r
-      operators: @profiler().operators\r
-    })\r
+    controller = Manifest.manifest().controllers[@has_one_manifest.table_name]\r
+    action = controller.actions[@has_one_manifest.list_name]\r
+    @list = Locmare.ListGroup.list(@has_one_manifest.item_name, @has_one_manifest.list_name)\r
+    params = {id: @item().get('id')}\r
+    _this = this\r
+    @list.open(@profiler().operators, params, action, {}, (page_status) ->\r
+      _this.filer = new Locmare.Filer({\r
+        item_name: _this.has_one_model().item_name(), \r
+        items: _this.list.models, \r
+        pager: _this.pager, \r
+        operators: _this.profiler().operators\r
+      })\r
+      _this.render()\r
+    )\r

   \r
   render: () ->\r
     this.$el.html('')\r
   \r
   render: () ->\r
     this.$el.html('')\r

diff --git a/app/assets/javascripts/locmare/profiler/header.js.coffee b/app/assets/javascripts/locmare/profiler/header.js.coffee
index ddadaf4..5e7bacd 100644 (file)
--- 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\r
     @filer = new Locmare.Filer({\r
       item_name: @profiler.item_name, \r
     @profiler = options.profiler\r
     @filer = new Locmare.Filer({\r
       item_name: @profiler.item_name, \r

-      collection: @profiler.item, \r
+      items: [@profiler.item], \r

       pager: @pager, \r
       operators: @profiler.operators\r
     })\r
       pager: @pager, \r
       operators: @profiler.operators\r
     })\r

diff --git a/app/assets/javascripts/manifest/controller/action/list.js.coffee b/app/assets/javascripts/manifest/controller/action/list.js.coffee
index 0620b37..55226df 100644 (file)
--- 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: () ->\r
     super()\r
     @list_name = @args.list_name\r
   init: () ->\r
     super()\r
     @list_name = @args.list_name\r

-    @counter_name = if not @args.counter_name\r
+    @counter_name = if @args.counter_name\r
+      @args.counter_name\r
+    else\r

       if @name == 'index'\r
         'count'\r
       else\r
       if @name == 'index'\r
         'count'\r
       else\r

-        'count_'\r
-    else\r
-      @args.counter_name\r
+        'count_' + @name\r

   \r
   counter_url: (params) ->\r
     @encode_url(@counter_name, params)\r
   \r
   counter_url: (params) ->\r
     @encode_url(@counter_name, params)\r

diff --git a/app/views/top/index.html.erb b/app/views/top/index.html.erb
index b848408..c910ab4 100644 (file)
--- a/app/views/top/index.html.erb
+++ b/app/views/top/index.html.erb
@@ -83,17 +83,6 @@
 'empty'\r
 </script>\r
 \r
 'empty'\r
 </script>\r
 \r

-<script type="text/template" id="templates-filer-summary-template">\r
-  <&= item_column.template_name &>\r
-</script>\r
-<script type="text/template" id="templates-filer-summary-none">\r
-</script>\r
-\r
-<script type="text/template" id="templates-filer-icon-default">\r
-  <a href="<&= item_column.path_name() &>">\r
-    <&= Pettanr.AppHelper.image_tag(item_column.icon_file_name(), {'size': item_column.icon_size()}) &>\r
-  </a>\r
-</script>\r

 <script type="text/template" id="templates-filer-date-default">\r
   <&= item_column.time_ago() &>\r
 </script>\r
 <script type="text/template" id="templates-filer-date-default">\r
   <&= item_column.time_ago() &>\r
 </script>\r