fix any

diff --git a/Gemfile b/Gemfile
index eab107b..b57a440 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ group :assets do
 end
 
 gem 'jquery-rails'
-gem 'jquery-ui-rails'
+gem 'jquery-ui-rails',   '~> 5.0'
 gem "jquery-validation-rails"
 
 # To use ActiveModel has_secure_password

diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js
index 86c8c01..19d77ef 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.ui.all
+//= require jquery-ui
 //require jquery.validate
 //require additional-methods
 //require jquery.validate.localization/messages_ja
@@ -288,6 +288,7 @@
 //= require_directory ./views/comic_stories
 //= require_directory ./views/ground_colors
 //= require_directory ./views/ground_pictures
+//= require_directory ./views/home
 //= require_directory ./views/licenses
 //= require_directory ./views/license_groups
 //= require_directory ./views/original_pictures

diff --git a/app/assets/javascripts/controllers/home.js.coffee b/app/assets/javascripts/controllers/home.js.coffee
index 0550142..7cb466f 100644 (file)
--- a/app/assets/javascripts/controllers/home.js.coffee
+++ b/app/assets/javascripts/controllers/home.js.coffee
@@ -1,7 +1,12 @@
 class Pettanr.HomeController extends Pettanr.AppController\r
 \r
-  by_author: () ->\r
-    @filer_list()\r
+  configure: () ->\r
+    view = new Pettanr.Views.Home.Configure({\r
+      el: "#pettanr",\r
+      item: @item,\r
+      operators: @operators\r
+    })\r
+    view.render()\r
   \r
   scrolls: () ->\r
     @filer_list()\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee
index 631736f..91d0302 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/edit/account.js.coffee
@@ -6,8 +6,10 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.EditItemColum
       attr: {'src': @edit_img_file_name()}, \r
       half: true\r
     })\r
+    url = 'home/configure'\r
     @edit_btn = new Tag.A({\r
-      attr: {href: '/home/configure'}, \r
+      attr: {href: '/' + url}, \r
+      handler_name: url,\r
       content: @edit_icon.render().el\r
     })\r
   \r

diff --git a/app/assets/javascripts/views.js.coffee b/app/assets/javascripts/views.js.coffee
index 5b76a62..eb5dffb 100644 (file)
--- a/app/assets/javascripts/views.js.coffee
+++ b/app/assets/javascripts/views.js.coffee
@@ -30,3 +30,4 @@ class Pettanr.Views.License extends Pettanr.Views.Base
 class Pettanr.Views.Author extends Pettanr.Views.Base\r
 class Pettanr.Views.Artist extends Pettanr.Views.Base\r
 class Pettanr.Views.SystemPicture extends Pettanr.Views.Base\r
+class Pettanr.Views.Home extends Pettanr.Views.Base\r

diff --git a/app/assets/javascripts/views/home/show.js.coffee b/app/assets/javascripts/views/home/show.js.coffee
new file mode 100644 (file)
index 0000000..ae6c0ac
--- /dev/null
+++ b/app/assets/javascripts/views/home/show.js.coffee
@@ -0,0 +1,11 @@
+class Pettanr.Views.Home.Configure extends Backbone.View\r
+  tagName: 'div'\r
+  \r
+  initialize: (options) ->\r
+    @item = options.item\r
+    @operators = options.operators\r
+  \r
+  render: () ->\r
+    this.$el.html('')\r
+    this\r
+  \r

diff --git a/app/assets/javascripts/work/controllers.js.coffee.erb b/app/assets/javascripts/work/controllers.js.coffee.erb
index 7472348..77638f7 100644 (file)
--- a/app/assets/javascripts/work/controllers.js.coffee.erb
+++ b/app/assets/javascripts/work/controllers.js.coffee.erb
@@ -243,6 +243,12 @@
           param_id: 'suffix',\r
         },\r
       },\r
+      by_author: {\r
+        type: 'list',\r
+        args: {\r
+          param_id: 'suffix',\r
+        },\r
+      },\r
       show: {\r
         type: 'show',\r
       },\r
@@ -258,6 +264,9 @@
       count_by_story: {\r
         type: 'count',\r
       },\r
+      count_by_author: {\r
+        type: 'count',\r
+      },\r
       new: {\r
         type: 'new',\r
       },\r

diff --git a/public/manifest.json b/public/manifest.json
index 6d30c92..9bc5eb9 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -449,6 +449,12 @@
             "param_id": "suffix"\r
           }\r
         },\r
+        "by_author": {\r
+          "type": "list",\r
+          "args": {\r
+            "param_id": "suffix"\r
+          }\r
+        },\r
         "show": {\r
           "type": "show"\r
         },\r
@@ -464,6 +470,9 @@
         "count_by_story": {\r
           "type": "count"\r
         },\r
+        "count_by_author": {\r
+          "type": "count"\r
+        },\r
         "new": {\r
           "type": "new"\r
         },\r