From 7a59e540ef3d13604ec34ecd1596a74e95635a5b Mon Sep 17 00:00:00 2001 From: yasushiito Date: Tue, 22 Apr 2014 08:50:13 +0900 Subject: [PATCH] fix resouce picture's profile --- .../javascripts/manifest/work/items.js.coffee.erb | 11 ++-- .../javascripts/manifest/work/models.js.coffee.erb | 9 +-- .../manifest/work/profilers.js.coffee.erb | 67 ++++++++++++++++++++++ lib/locmare/booster.rb | 8 +-- public/local_manifest.json | 61 ++++++++++++++++++++ public/manifest.json | 22 ++++--- 6 files changed, 155 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/manifest/work/items.js.coffee.erb b/app/assets/javascripts/manifest/work/items.js.coffee.erb index 39ebab39..a383a5f6 100644 --- a/app/assets/javascripts/manifest/work/items.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/items.js.coffee.erb @@ -100,7 +100,7 @@ boost: { # expand license_group_settings license_group: { - resource_name: 'license', + resource_name: 'license_group', extend_column_name: 'license_group_classname', settings_column_name: 'license_group_settings', extend_model_class_name: 'License', @@ -109,13 +109,14 @@ # expand license_settings license: { level: 'read', + resource_name: 'license_group', extend_column_name: 'license_group_classname', extend_model_class_name: 'Attribute', extend_item_name: 'attribute', }, credit_picture: { level: 'read', - resource_name: 'license', + resource_name: 'license_group', extend_column_name: 'license_group_classname', settings_column_name: 'credit_picture_settings', extend_model_class_name: 'CreditPicture', @@ -129,7 +130,7 @@ boost: { # expand license_group_settings license_group: { - resource_name: 'license', + resource_name: 'license_group', engine_resource_name: 'license_groups', engine_resource_extend_column_name: 'license_group_classname', extend_column_name: 'license_group_classname', @@ -140,15 +141,17 @@ # expand license_settings 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', + resource_name: 'license_group', engine_resource_name: 'license_groups', engine_resource_extend_column_name: 'license_group_classname', extend_column_name: 'license_group_classname', diff --git a/app/assets/javascripts/manifest/work/models.js.coffee.erb b/app/assets/javascripts/manifest/work/models.js.coffee.erb index 206aedad..8d38edfb 100644 --- a/app/assets/javascripts/manifest/work/models.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/models.js.coffee.erb @@ -2369,19 +2369,20 @@ number: true, } }, - artist_name: { - type: 'text', + system_picture_id: { + type: 'number', rules : { required: true, + number: true, } }, - caption: { + source_url: { type: 'text', rules : { required: true, } }, - sources: { + note: { type: 'text', rules : { required: true, diff --git a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb index 3af686b5..71074fb5 100644 --- a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb +++ b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb @@ -541,6 +541,19 @@ 'source_url_off_btn_id', ], }, + pettanr_creative_commons_v30_licenses_attribute: { + columns: { + }, + column_names: [ + 'license_id', + 'system_picture_id', + 'artist_name', + 'caption', + 'artist_url', + 'source_url', + 'more_permission_url', + ], + }, pettanr_pettan_commons_v01_licenses_license: { columns: { }, @@ -565,6 +578,17 @@ 'source_url_off_btn_id', ], }, + pettanr_pettan_commons_v01_licenses_attribute: { + columns: { + }, + column_names: [ + 'license_id', + 'system_picture_id', + 'artist_name', + 'caption', + 'sources', + ], + }, pettanr_pettan_protected_v01_licenses_license: { columns: { }, @@ -590,6 +614,17 @@ 'source_url_off_btn_id', ], }, + pettanr_pettan_protected_v01_licenses_attribute: { + columns: { + }, + column_names: [ + 'license_id', + 'system_picture_id', + 'artist_name', + 'caption', + 'sources', + ], + }, pettanr_pettan_public_v01_licenses_license: { columns: { }, @@ -614,6 +649,17 @@ 'source_url_btn_id', ], }, + pettanr_pettan_public_v01_licenses_attribute: { + columns: { + }, + column_names: [ + 'license_id', + 'system_picture_id', + 'artist_name', + 'caption', + 'sources', + ], + }, pettanr_public_domain_v01_licenses_license: { columns: { }, @@ -639,6 +685,17 @@ 'source_url_off_btn_id', ], }, + pettanr_public_domain_v01_licenses_attribute: { + columns: { + }, + column_names: [ + 'license_id', + 'system_picture_id', + 'artist_name', + 'source_url', + 'note', + ], + }, pettanr_unknown_v01_licenses_license: { columns: { }, @@ -664,6 +721,16 @@ 'source_url_off_btn_id', ], }, + pettanr_unknown_v01_licenses_attribute: { + columns: { + }, + column_names: [ + 'license_id', + 'system_picture_id', + 'source_url', + 'note', + ], + }, }, associations: { has_many: [ diff --git a/lib/locmare/booster.rb b/lib/locmare/booster.rb index a8201d4a..edc6d745 100644 --- a/lib/locmare/booster.rb +++ b/lib/locmare/booster.rb @@ -23,8 +23,7 @@ module Locmare end def engine_classname - return self.resource.classname unless @manifest.engine_resource_extend_column_name - self.resource.attributes[@manifest.engine_resource_extend_column_name] + @item.attributes[@manifest.extend_column_name] end # get snake_case engine name @@ -78,10 +77,7 @@ module Locmare # get system resource instance def resource - raise 'blank foreign_key ' + @manifest.name unless self.check_resource - r = @item.__send__ @manifest.resource_name - raise 'resource not found' + @manifest.resource_name unless r - r + Manifest.manifest.models[@manifest.resource_name].classify end # get extend instance diff --git a/public/local_manifest.json b/public/local_manifest.json index 8665bb55..7680e5b5 100644 --- a/public/local_manifest.json +++ b/public/local_manifest.json @@ -940,6 +940,18 @@ "source_url_off_btn_id" ] }, + "pettanr_creative_commons_v30_licenses_attribute": { + "columns": {}, + "column_names": [ + "license_id", + "system_picture_id", + "artist_name", + "caption", + "artist_url", + "source_url", + "more_permission_url" + ] + }, "pettanr_pettan_commons_v01_licenses_license": { "columns": {}, "column_names": [ @@ -962,6 +974,16 @@ "source_url_off_btn_id" ] }, + "pettanr_pettan_commons_v01_licenses_attribute": { + "columns": {}, + "column_names": [ + "license_id", + "system_picture_id", + "artist_name", + "caption", + "sources" + ] + }, "pettanr_pettan_protected_v01_licenses_license": { "columns": {}, "column_names": [ @@ -985,6 +1007,16 @@ "source_url_off_btn_id" ] }, + "pettanr_pettan_protected_v01_licenses_attribute": { + "columns": {}, + "column_names": [ + "license_id", + "system_picture_id", + "artist_name", + "caption", + "sources" + ] + }, "pettanr_pettan_public_v01_licenses_license": { "columns": {}, "column_names": [ @@ -1007,6 +1039,16 @@ "source_url_btn_id" ] }, + "pettanr_pettan_public_v01_licenses_attribute": { + "columns": {}, + "column_names": [ + "license_id", + "system_picture_id", + "artist_name", + "caption", + "sources" + ] + }, "pettanr_public_domain_v01_licenses_license": { "columns": {}, "column_names": [ @@ -1030,6 +1072,16 @@ "source_url_off_btn_id" ] }, + "pettanr_public_domain_v01_licenses_attribute": { + "columns": {}, + "column_names": [ + "license_id", + "system_picture_id", + "artist_name", + "source_url", + "note" + ] + }, "pettanr_unknown_v01_licenses_license": { "columns": {}, "column_names": [ @@ -1052,6 +1104,15 @@ "source_url_btn_id", "source_url_off_btn_id" ] + }, + "pettanr_unknown_v01_licenses_attribute": { + "columns": {}, + "column_names": [ + "license_id", + "system_picture_id", + "source_url", + "note" + ] } }, "associations": { diff --git a/public/manifest.json b/public/manifest.json index fb4b3ed9..cf9648bd 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -89,7 +89,7 @@ "args": { "boost": { "license_group": { - "resource_name": "license", + "resource_name": "license_group", "extend_column_name": "license_group_classname", "settings_column_name": "license_group_settings", "extend_model_class_name": "License", @@ -97,13 +97,14 @@ }, "license": { "level": "read", + "resource_name": "license_group", "extend_column_name": "license_group_classname", "extend_model_class_name": "Attribute", "extend_item_name": "attribute" }, "credit_picture": { "level": "read", - "resource_name": "license", + "resource_name": "license_group", "extend_column_name": "license_group_classname", "settings_column_name": "credit_picture_settings", "extend_model_class_name": "CreditPicture", @@ -116,7 +117,7 @@ "args": { "boost": { "license_group": { - "resource_name": "license", + "resource_name": "license_group", "engine_resource_name": "license_groups", "engine_resource_extend_column_name": "license_group_classname", "extend_column_name": "license_group_classname", @@ -126,15 +127,17 @@ }, "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", + "resource_name": "license_group", "engine_resource_name": "license_groups", "engine_resource_extend_column_name": "license_group_classname", "extend_column_name": "license_group_classname", @@ -3371,19 +3374,20 @@ "number": true } }, - "artist_name": { - "type": "text", + "system_picture_id": { + "type": "number", "rules": { - "required": true + "required": true, + "number": true } }, - "caption": { + "source_url": { "type": "text", "rules": { "required": true } }, - "sources": { + "note": { "type": "text", "rules": { "required": true -- 2.11.0