diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index d2377ad49..fed11e680 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -24,6 +24,10 @@ - fix [ 1171110 ] nav ancestor - fix [ 1171574 ] purgeList doesn't purgeList - fix [ 1170244 ] cs notification + - fix [ 1171616 ] default templateId for Folder is wrong + - fix [ 1170269 ] 6.2.11->6.3.0 fails if any product-related/accessories + exist + - fix [ 1170426 ] missing entries and wrong descriptions in webgui help 6.5.4 diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl index 574228d5c..b3ba41fc9 100644 --- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl @@ -126,11 +126,9 @@ WebGUI::SQL->write("alter table Product_specification add assetId varchar(22) no WebGUI::SQL->write("alter table Product_accessory drop primary key"); WebGUI::SQL->write("alter table Product_accessory add assetId varchar(22) not null"); WebGUI::SQL->write("alter table Product_accessory add accessoryAssetId varchar(22) not null"); -WebGUI::SQL->write("alter table Product_accessory add primary key (assetId,accessoryAssetId)"); WebGUI::SQL->write("alter table Product_related drop primary key"); WebGUI::SQL->write("alter table Product_related add assetId varchar(22) not null"); WebGUI::SQL->write("alter table Product_related add relatedAssetId varchar(22) not null"); -WebGUI::SQL->write("alter table Product_related add primary key (assetId,relatedAssetId)"); WebGUI::SQL->write("alter table WobjectProxy add column description mediumtext"); WebGUI::SQL->write("alter table EventsCalendar change column isMaster scope integer not null default 0"); WebGUI::SQL->write("alter table EventsCalendar_event add column eventLocation text"); @@ -248,6 +246,8 @@ WebGUI::SQL->write("alter table DataForm_entry drop column wobjectId"); WebGUI::SQL->write("alter table DataForm_entryData drop column wobjectId"); WebGUI::SQL->write("alter table DataForm_field drop column wobjectId"); WebGUI::SQL->write("alter table DataForm_tab drop column wobjectId"); +WebGUI::SQL->write("alter table Product_related add primary key (assetId,relatedAssetId)"); +WebGUI::SQL->write("alter table Product_accessory add primary key (assetId,accessoryAssetId)"); WebGUI::SQL->write("alter table Product_accessory drop column wobjectId"); WebGUI::SQL->write("alter table Product_benefit drop column wobjectId"); WebGUI::SQL->write("alter table Product_feature drop column wobjectId"); diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 133fa0ff9..41b75fbda 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -814,7 +814,7 @@ sub getAssetManagerControl { $output .= "manager.assetType='".$controlType."';\n" if (defined $controlType); $output .= "manager.disableDisplay(0);\n" if (defined $removeRank); if ($controlType eq "ManageTrash" || $controlType eq "ManageClipboard") { - # $output .= "manager.displayCrumbTrail = false;\n"; + #$output .= "manager.displayCrumbTrail = false;\n"; # $output .= "manager.sortEnabled = false;\n"; } $output .= "manager.renderAssets();\n"; diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index d55a5ac59..a206f8f82 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -64,7 +64,7 @@ sub definition { properties=>{ templateId =>{ fieldType=>"template", - defaultValue=>'PBtmpl0000000000000054' + defaultValue=>'PBtmpl0000000000000078' } } }); diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index dea5ece12..5df22e41e 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -17,7 +17,7 @@ our $I18N = { 'properties' => { message => q|Properties|, lastUpdated => 1099344172, - context => q|The name of the properties tab on the edit page.| + context => q|The name of the properties tab on the edit asset.| }, 'make package' => { @@ -281,7 +281,7 @@ It is advisable to use only letters (a-z), numbers (0-9) or underscores (_) for the field names.

Description
An optional description for this metadata property. This text is displayed -as mouseover text in the wobject properties tab.

+as mouseover text in the asset properties tab.

Data Type
Choose the type of form element for this field.

@@ -305,7 +305,7 @@ information about the content, and is defined in terms of property-value pairs.<

In the example source: newspaper, this metadata has a property named source with a value of newspaper.

Metadata properties are defined globally, while Metadata values are set for -each wobject under the tab "Metadata" in the wobject properties.

+each asset under the tab "Meta" in the asset properties.

Before you can use metadata in WebGUI, you'll have to switch the "Enable Metadata ?" setting to Yes in the Manage Settings menu.

Usage of metadata:

@@ -330,9 +330,15 @@ each wobject under the tab "Metadata" in the wobject properties.

You can use the AOI macro's described above in the criteria, so you can present content based upon the users Areas of Interest. Example:
type = ^AOIRank(contenttype);

+

  • Display
    + Metadata fields are exposed to the asset templates as their property name. So you can actually display the metadata + to the rendered page using a template variable like <tmpl_var propertyname>

    • +

  • Meta tags
    + Since the meta data is exposed as template variables, you can use that in combination with the ^RawHeadTags(); + macro to create meta tags from meta data, including the tags from the Dublin Core standard.

    • |, context => q|Metadata help|, - lastUpdated => 1099530955 + lastUpdated => 1110530955 }, 'Metadata, Edit property' => { diff --git a/www/extras/assetManager/AssetManager.js b/www/extras/assetManager/AssetManager.js index 687b5dd29..a95c61f65 100644 --- a/www/extras/assetManager/AssetManager.js +++ b/www/extras/assetManager/AssetManager.js @@ -294,4 +294,4 @@ function AssetManager_sortGrid(columnIndex) { tableBody.appendChild(rowArray[i]); } } - \ No newline at end of file +