X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmanifest%2Fwork%2Fprofilers.js.coffee.erb;h=3af686b5e0394aef954f9a33b0d7e1d2eb68ed07;hp=d3ecf66c411a8ccee193389dcc0e4e576e9a28c1;hb=5d4a84528ce84792699f6987262d3b8ac5453b52;hpb=ca071ae6b2bc69089d48271a717dc775a77fc380

diff --git a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
index d3ecf66c..3af686b5 100644
--- a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
@@ -302,6 +302,17 @@
     }, 
   },
   picture: {
+    columns: {
+      license_group_settings: {
+        type: 'extend',
+      }, 
+      credit_picture_settings: {
+        type: 'extend',
+      }, 
+      license_settings: {
+        type: 'extend',
+      }, 
+    },
     column_names: [
       'original_picture_id', 
       'revision', 
@@ -313,9 +324,10 @@
       'license_id', 
       'md5', 
       'artist_name', 
-      'credit', 
-      'settings', 
-      'classname', 
+      'license_group_settings', 
+      'credit_picture_settings', 
+      'license_settings', 
+      'license_group_classname', 
     ],
     associations: {
       belongs_to: [
@@ -325,6 +337,26 @@
     }, 
   },
   resource_picture: {
+    columns: {
+      license_group_settings: {
+        type: 'extend',
+        args: {
+          boost_name: 'license_group',
+        },
+      }, 
+      credit_picture_settings: {
+        type: 'extend',
+        args: {
+          boost_name: 'credit_picture',
+        },
+      }, 
+      license_settings: {
+        type: 'extend',
+        args: {
+          boost_name: 'license',
+        },
+      }, 
+    },
     column_names: [
       'original_picture_id', 
       'revision', 
@@ -336,10 +368,11 @@
       'license_id', 
       'md5', 
       'artist_name', 
-      'credit', 
-      'settings', 
+      'license_group_settings', 
+      'credit_picture_settings', 
+      'license_settings', 
       'picture_id', 
-      'classname', 
+      'license_group_classname', 
     ],
     associations: {
       belongs_to: [
@@ -484,6 +517,30 @@
       'url', 
     ],
     extend_settings: {
+      pettanr_creative_commons_v30_licenses_license: {
+        columns: {
+        },
+        column_names: [
+          'open', 
+          'commercial', 
+          'official', 
+          'attribution', 
+          'derive', 
+          'thumbnail', 
+          'gif_convert', 
+          'reverse', 
+          'sync_vh', 
+          'overlap', 
+        ],
+      },
+      pettanr_creative_commons_v30_licenses_credit_picture: {
+        columns: {
+        },
+        column_names: [
+          'source_url_btn_id', 
+          'source_url_off_btn_id', 
+        ],
+      },
       pettanr_pettan_commons_v01_licenses_license: {
         columns: {
         },
@@ -491,7 +548,7 @@
           'open', 
           'commercial', 
           'official', 
-          'attribution:', 
+          'attribution', 
           'derive', 
           'thumbnail', 
           'gif_convert', 
@@ -508,6 +565,105 @@
           'source_url_off_btn_id', 
         ],
       },
+      pettanr_pettan_protected_v01_licenses_license: {
+        columns: {
+        },
+        column_names: [
+          'open', 
+          'commercial', 
+          'official', 
+          'attribution', 
+          'derive', 
+          'thumbnail', 
+          'gif_convert', 
+          'reverse', 
+          'sync_vh', 
+          'overlap', 
+          'trackback', 
+        ],
+      },
+      pettanr_pettan_protected_v01_licenses_credit_picture: {
+        columns: {
+        },
+        column_names: [
+          'source_url_btn_id', 
+          'source_url_off_btn_id', 
+        ],
+      },
+      pettanr_pettan_public_v01_licenses_license: {
+        columns: {
+        },
+        column_names: [
+          'open', 
+          'commercial', 
+          'official', 
+          'attribution', 
+          'derive', 
+          'thumbnail', 
+          'gif_convert', 
+          'reverse', 
+          'sync_vh', 
+          'overlap', 
+          'trackback', 
+        ],
+      },
+      pettanr_pettan_public_v01_licenses_credit_picture: {
+        columns: {
+        },
+        column_names: [
+          'source_url_btn_id', 
+        ],
+      },
+      pettanr_public_domain_v01_licenses_license: {
+        columns: {
+        },
+        column_names: [
+          'open', 
+          'commercial', 
+          'official', 
+          'attribution', 
+          'derive', 
+          'thumbnail', 
+          'gif_convert', 
+          'reverse', 
+          'sync_vh', 
+          'overlap', 
+          'trackback', 
+        ],
+      },
+      pettanr_public_domain_v01_licenses_credit_picture: {
+        columns: {
+        },
+        column_names: [
+          'source_url_btn_id', 
+          'source_url_off_btn_id', 
+        ],
+      },
+      pettanr_unknown_v01_licenses_license: {
+        columns: {
+        },
+        column_names: [
+          'open', 
+          'commercial', 
+          'official', 
+          'attribution', 
+          'derive', 
+          'thumbnail', 
+          'gif_convert', 
+          'reverse', 
+          'sync_vh', 
+          'overlap', 
+          'trackback', 
+        ],
+      },
+      pettanr_unknown_v01_licenses_credit_picture: {
+        columns: {
+        },
+        column_names: [
+          'source_url_btn_id', 
+          'source_url_off_btn_id', 
+        ],
+      },
     },
     associations: {
       has_many: [
@@ -530,6 +686,44 @@
         },
       }, 
     },
+    extend_settings: {
+      pettanr_creative_commons_v30_licenses_attribute: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      pettanr_pettan_commons_v01_licenses_attribute: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      pettanr_pettan_protected_v01_licenses_attribute: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      pettanr_pettan_public_v01_licenses_attribute: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      pettanr_public_domain_v01_licenses_attribute: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      pettanr_unknown_v01_licenses_attribute: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+    },
     column_names: [
       'license_group_id', 
       'license_group_classname',