From 2c809158353a14cb6c9dca986638ac8db68e4b3a Mon Sep 17 00:00:00 2001 From: yasushiito Date: Fri, 25 Apr 2014 11:24:58 +0900 Subject: [PATCH] fix picture index action --- .../javascripts/manifest/work/controllers.js.coffee.erb | 7 +++++++ app/assets/javascripts/manifest/work/items.js.coffee.erb | 7 +++++++ .../javascripts/manifest/work/list_groups.js.coffee.erb | 5 +++++ config/locales/pettanr.ja.yml | 2 ++ config/routes.rb | 3 ++- public/local_manifest.json | 8 +++++++- public/manifest.json | 13 +++++++++++++ 7 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/manifest/work/controllers.js.coffee.erb b/app/assets/javascripts/manifest/work/controllers.js.coffee.erb index dd1a8448..687dad97 100644 --- a/app/assets/javascripts/manifest/work/controllers.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/controllers.js.coffee.erb @@ -576,6 +576,13 @@ }, pictures: { actions: { + index: { + type: 'list', + args: { + list_name: 'public', + + }, + }, show: { type: 'show', }, diff --git a/app/assets/javascripts/manifest/work/items.js.coffee.erb b/app/assets/javascripts/manifest/work/items.js.coffee.erb index 7297d88d..e4ba0441 100644 --- a/app/assets/javascripts/manifest/work/items.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/items.js.coffee.erb @@ -103,6 +103,8 @@ # expand license_group_settings license_group: { resource_name: 'license_group', + engine_resource_name: 'license_groups', + engine_resource_extend_column_name: 'license_group_classname', extend_column_name: 'license_group_classname', settings_column_name: 'license_group_settings', extend_model_class_name: 'License', @@ -112,13 +114,18 @@ license: { level: 'read', resource_name: 'license_group', + engine_resource_name: 'license_groups', + engine_resource_extend_column_name: 'license_group_classname', extend_column_name: 'license_group_classname', + settings_column_name: 'license_settings', extend_model_class_name: 'Attribute', extend_item_name: 'attribute', }, credit_picture: { level: 'read', resource_name: 'license_group', + engine_resource_name: 'license_groups', + engine_resource_extend_column_name: 'license_group_classname', extend_column_name: 'license_group_classname', settings_column_name: 'credit_picture_settings', extend_model_class_name: 'CreditPicture', diff --git a/app/assets/javascripts/manifest/work/list_groups.js.coffee.erb b/app/assets/javascripts/manifest/work/list_groups.js.coffee.erb index 6d915c0c..6d116ab3 100644 --- a/app/assets/javascripts/manifest/work/list_groups.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/list_groups.js.coffee.erb @@ -338,6 +338,11 @@ }, }, picture: { + lists: { + public: { + type: 'public', + }, + }, }, resource_picture: { lists: { diff --git a/config/locales/pettanr.ja.yml b/config/locales/pettanr.ja.yml index 10d43af8..edfcca6f 100644 --- a/config/locales/pettanr.ja.yml +++ b/config/locales/pettanr.ja.yml @@ -933,6 +933,8 @@ ja: tail: 廃盤 disable: 停止中 pictures: + index: + title: 実素材一覧 show: title: 実素材詳細 announce: diff --git a/config/routes.rb b/config/routes.rb index ebb2dd03..ad38cdac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -334,6 +334,7 @@ Pettanr::Application.routes.draw do end resources :pictures do collection do + get :index get :show get :credit get :search @@ -579,7 +580,7 @@ Pettanr::Application.routes.draw do # resource_pictures/1.png?subdir=full # match 'resource_pictures/full/:id(.:format)/' => 'resource_pictures#show' - match 'pictures/:subdir/:id(.:format)/' => 'pictures#show' + # match 'pictures/:subdir/:id(.:format)/' => 'pictures#show' #match 'scroll_panels/scroll/:id(.:format)' => 'scroll_panels#scroll' match 'top/(:action)', :controller => 'top' match 'home/(:action)', :controller => 'home' diff --git a/public/local_manifest.json b/public/local_manifest.json index 970898f6..3de3b5ae 100644 --- a/public/local_manifest.json +++ b/public/local_manifest.json @@ -337,7 +337,13 @@ } } }, - "picture": {}, + "picture": { + "lists": { + "public": { + "type": "public" + } + } + }, "resource_picture": { "lists": { "public": { diff --git a/public/manifest.json b/public/manifest.json index d748d99a..8081e9cc 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -94,6 +94,8 @@ "boost": { "license_group": { "resource_name": "license_group", + "engine_resource_name": "license_groups", + "engine_resource_extend_column_name": "license_group_classname", "extend_column_name": "license_group_classname", "settings_column_name": "license_group_settings", "extend_model_class_name": "License", @@ -102,13 +104,18 @@ "license": { "level": "read", "resource_name": "license_group", + "engine_resource_name": "license_groups", + "engine_resource_extend_column_name": "license_group_classname", "extend_column_name": "license_group_classname", + "settings_column_name": "license_settings", "extend_model_class_name": "Attribute", "extend_item_name": "attribute" }, "credit_picture": { "level": "read", "resource_name": "license_group", + "engine_resource_name": "license_groups", + "engine_resource_extend_column_name": "license_group_classname", "extend_column_name": "license_group_classname", "settings_column_name": "credit_picture_settings", "extend_model_class_name": "CreditPicture", @@ -728,6 +735,12 @@ }, "pictures": { "actions": { + "index": { + "type": "list", + "args": { + "list_name": "public" + } + }, "show": { "type": "show" } -- 2.11.0