fix resouce picture's profile

diff --git a/app/assets/javascripts/manifest/work/items.js.coffee.erb b/app/assets/javascripts/manifest/work/items.js.coffee.erb
index 39ebab3..a383a5f 100644 (file)
--- 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: {\r
         # expand license_group_settings\r
         license_group: {\r
-          resource_name: 'license',\r
+          resource_name: 'license_group',\r
           extend_column_name: 'license_group_classname',\r
           settings_column_name: 'license_group_settings',\r
           extend_model_class_name: 'License',\r
@@ -109,13 +109,14 @@
         # expand license_settings\r
         license: {\r
           level: 'read',\r
+          resource_name: 'license_group',\r
           extend_column_name: 'license_group_classname',\r
           extend_model_class_name: 'Attribute',\r
           extend_item_name: 'attribute',\r
         },\r
         credit_picture: {\r
           level: 'read',\r
-          resource_name: 'license',\r
+          resource_name: 'license_group',\r
           extend_column_name: 'license_group_classname',\r
           settings_column_name: 'credit_picture_settings',\r
           extend_model_class_name: 'CreditPicture',\r
@@ -129,7 +130,7 @@
       boost: {\r
         # expand license_group_settings\r
         license_group: {\r
-          resource_name: 'license',\r
+          resource_name: 'license_group',\r
           engine_resource_name: 'license_groups',\r
           engine_resource_extend_column_name: 'license_group_classname',\r
           extend_column_name: 'license_group_classname',\r
@@ -140,15 +141,17 @@
         # expand license_settings\r
         license: {\r
           level: 'read',\r
+          resource_name: 'license_group',\r
           engine_resource_name: 'license_groups',\r
           engine_resource_extend_column_name: 'license_group_classname',\r
           extend_column_name: 'license_group_classname',\r
+          settings_column_name: 'license_settings',\r
           extend_model_class_name: 'Attribute',\r
           extend_item_name: 'attribute',\r
         },\r
         credit_picture: {\r
           level: 'read',\r
-          resource_name: 'license',\r
+          resource_name: 'license_group',\r
           engine_resource_name: 'license_groups',\r
           engine_resource_extend_column_name: 'license_group_classname',\r
           extend_column_name: 'license_group_classname',\r

diff --git a/app/assets/javascripts/manifest/work/models.js.coffee.erb b/app/assets/javascripts/manifest/work/models.js.coffee.erb
index 206aeda..8d38edf 100644 (file)
--- 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,\r
         }\r
       },\r
-      artist_name: {\r
-        type: 'text',\r
+      system_picture_id: {\r
+        type: 'number',\r
         rules : {\r
           required: true,\r
+          number: true,\r
         }\r
       },\r
-      caption: {\r
+      source_url: {\r
         type: 'text',\r
         rules : {\r
           required: true,\r
         }\r
       },\r
-      sources: {\r
+      note: {\r
         type: 'text',\r
         rules : {\r
           required: true,\r

diff --git a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
index 3af686b..71074fb 100644 (file)
--- 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', \r
         ],\r
       },\r
+      pettanr_creative_commons_v30_licenses_attribute: {\r
+        columns: {\r
+        },\r
+        column_names: [\r
+          'license_id', \r
+          'system_picture_id', \r
+          'artist_name', \r
+          'caption', \r
+          'artist_url', \r
+          'source_url', \r
+          'more_permission_url', \r
+        ],\r
+      },\r
       pettanr_pettan_commons_v01_licenses_license: {\r
         columns: {\r
         },\r
@@ -565,6 +578,17 @@
           'source_url_off_btn_id', \r
         ],\r
       },\r
+      pettanr_pettan_commons_v01_licenses_attribute: {\r
+        columns: {\r
+        },\r
+        column_names: [\r
+          'license_id', \r
+          'system_picture_id', \r
+          'artist_name', \r
+          'caption', \r
+          'sources', \r
+        ],\r
+      },\r
       pettanr_pettan_protected_v01_licenses_license: {\r
         columns: {\r
         },\r
@@ -590,6 +614,17 @@
           'source_url_off_btn_id', \r
         ],\r
       },\r
+      pettanr_pettan_protected_v01_licenses_attribute: {\r
+        columns: {\r
+        },\r
+        column_names: [\r
+          'license_id', \r
+          'system_picture_id', \r
+          'artist_name', \r
+          'caption', \r
+          'sources', \r
+        ],\r
+      },\r
       pettanr_pettan_public_v01_licenses_license: {\r
         columns: {\r
         },\r
@@ -614,6 +649,17 @@
           'source_url_btn_id', \r
         ],\r
       },\r
+      pettanr_pettan_public_v01_licenses_attribute: {\r
+        columns: {\r
+        },\r
+        column_names: [\r
+          'license_id', \r
+          'system_picture_id', \r
+          'artist_name', \r
+          'caption', \r
+          'sources', \r
+        ],\r
+      },\r
       pettanr_public_domain_v01_licenses_license: {\r
         columns: {\r
         },\r
@@ -639,6 +685,17 @@
           'source_url_off_btn_id', \r
         ],\r
       },\r
+      pettanr_public_domain_v01_licenses_attribute: {\r
+        columns: {\r
+        },\r
+        column_names: [\r
+          'license_id', \r
+          'system_picture_id', \r
+          'artist_name', \r
+          'source_url', \r
+          'note', \r
+        ],\r
+      },\r
       pettanr_unknown_v01_licenses_license: {\r
         columns: {\r
         },\r
@@ -664,6 +721,16 @@
           'source_url_off_btn_id', \r
         ],\r
       },\r
+      pettanr_unknown_v01_licenses_attribute: {\r
+        columns: {\r
+        },\r
+        column_names: [\r
+          'license_id', \r
+          'system_picture_id', \r
+          'source_url', \r
+          'note', \r
+        ],\r
+      },\r
     },\r
     associations: {\r
       has_many: [\r

diff --git a/lib/locmare/booster.rb b/lib/locmare/booster.rb
index a8201d4..edc6d74 100644 (file)
--- 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 8665bb5..7680e5b 100644 (file)
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -940,6 +940,18 @@
             "source_url_off_btn_id"\r
           ]\r
         },\r
+        "pettanr_creative_commons_v30_licenses_attribute": {\r
+          "columns": {},\r
+          "column_names": [\r
+            "license_id",\r
+            "system_picture_id",\r
+            "artist_name",\r
+            "caption",\r
+            "artist_url",\r
+            "source_url",\r
+            "more_permission_url"\r
+          ]\r
+        },\r
         "pettanr_pettan_commons_v01_licenses_license": {\r
           "columns": {},\r
           "column_names": [\r
@@ -962,6 +974,16 @@
             "source_url_off_btn_id"\r
           ]\r
         },\r
+        "pettanr_pettan_commons_v01_licenses_attribute": {\r
+          "columns": {},\r
+          "column_names": [\r
+            "license_id",\r
+            "system_picture_id",\r
+            "artist_name",\r
+            "caption",\r
+            "sources"\r
+          ]\r
+        },\r
         "pettanr_pettan_protected_v01_licenses_license": {\r
           "columns": {},\r
           "column_names": [\r
@@ -985,6 +1007,16 @@
             "source_url_off_btn_id"\r
           ]\r
         },\r
+        "pettanr_pettan_protected_v01_licenses_attribute": {\r
+          "columns": {},\r
+          "column_names": [\r
+            "license_id",\r
+            "system_picture_id",\r
+            "artist_name",\r
+            "caption",\r
+            "sources"\r
+          ]\r
+        },\r
         "pettanr_pettan_public_v01_licenses_license": {\r
           "columns": {},\r
           "column_names": [\r
@@ -1007,6 +1039,16 @@
             "source_url_btn_id"\r
           ]\r
         },\r
+        "pettanr_pettan_public_v01_licenses_attribute": {\r
+          "columns": {},\r
+          "column_names": [\r
+            "license_id",\r
+            "system_picture_id",\r
+            "artist_name",\r
+            "caption",\r
+            "sources"\r
+          ]\r
+        },\r
         "pettanr_public_domain_v01_licenses_license": {\r
           "columns": {},\r
           "column_names": [\r
@@ -1030,6 +1072,16 @@
             "source_url_off_btn_id"\r
           ]\r
         },\r
+        "pettanr_public_domain_v01_licenses_attribute": {\r
+          "columns": {},\r
+          "column_names": [\r
+            "license_id",\r
+            "system_picture_id",\r
+            "artist_name",\r
+            "source_url",\r
+            "note"\r
+          ]\r
+        },\r
         "pettanr_unknown_v01_licenses_license": {\r
           "columns": {},\r
           "column_names": [\r
@@ -1052,6 +1104,15 @@
             "source_url_btn_id",\r
             "source_url_off_btn_id"\r
           ]\r
+        },\r
+        "pettanr_unknown_v01_licenses_attribute": {\r
+          "columns": {},\r
+          "column_names": [\r
+            "license_id",\r
+            "system_picture_id",\r
+            "source_url",\r
+            "note"\r
+          ]\r
         }\r
       },\r
       "associations": {\r

diff --git a/public/manifest.json b/public/manifest.json
index fb4b3ed..cf9648b 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -89,7 +89,7 @@
       "args": {\r
         "boost": {\r
           "license_group": {\r
-            "resource_name": "license",\r
+            "resource_name": "license_group",\r
             "extend_column_name": "license_group_classname",\r
             "settings_column_name": "license_group_settings",\r
             "extend_model_class_name": "License",\r
@@ -97,13 +97,14 @@
           },\r
           "license": {\r
             "level": "read",\r
+            "resource_name": "license_group",\r
             "extend_column_name": "license_group_classname",\r
             "extend_model_class_name": "Attribute",\r
             "extend_item_name": "attribute"\r
           },\r
           "credit_picture": {\r
             "level": "read",\r
-            "resource_name": "license",\r
+            "resource_name": "license_group",\r
             "extend_column_name": "license_group_classname",\r
             "settings_column_name": "credit_picture_settings",\r
             "extend_model_class_name": "CreditPicture",\r
@@ -116,7 +117,7 @@
       "args": {\r
         "boost": {\r
           "license_group": {\r
-            "resource_name": "license",\r
+            "resource_name": "license_group",\r
             "engine_resource_name": "license_groups",\r
             "engine_resource_extend_column_name": "license_group_classname",\r
             "extend_column_name": "license_group_classname",\r
@@ -126,15 +127,17 @@
           },\r
           "license": {\r
             "level": "read",\r
+            "resource_name": "license_group",\r
             "engine_resource_name": "license_groups",\r
             "engine_resource_extend_column_name": "license_group_classname",\r
             "extend_column_name": "license_group_classname",\r
+            "settings_column_name": "license_settings",\r
             "extend_model_class_name": "Attribute",\r
             "extend_item_name": "attribute"\r
           },\r
           "credit_picture": {\r
             "level": "read",\r
-            "resource_name": "license",\r
+            "resource_name": "license_group",\r
             "engine_resource_name": "license_groups",\r
             "engine_resource_extend_column_name": "license_group_classname",\r
             "extend_column_name": "license_group_classname",\r
@@ -3371,19 +3374,20 @@
             "number": true\r
           }\r
         },\r
-        "artist_name": {\r
-          "type": "text",\r
+        "system_picture_id": {\r
+          "type": "number",\r
           "rules": {\r
-            "required": true\r
+            "required": true,\r
+            "number": true\r
           }\r
         },\r
-        "caption": {\r
+        "source_url": {\r
           "type": "text",\r
           "rules": {\r
             "required": true\r
           }\r
         },\r
-        "sources": {\r
+        "note": {\r
           "type": "text",\r
           "rules": {\r
             "required": true\r