bug fixes

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 

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");

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";

lib/WebGUI/Asset/Wobject/Folder.pm

@@ -64,7 +64,7 @@ sub definition {
                 properties=>{
 			templateId =>{
 				fieldType=>"template",
-				defaultValue=>'PBtmpl0000000000000054'
+				defaultValue=>'PBtmpl0000000000000078'
 				}
                         }
                 });

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.
 <p><b>Description<br>
 </b>An optional description for this metadata property. This text is displayed
-as mouseover text in the wobject properties tab.</p>
+as mouseover text in the asset properties tab.</p>
 <p><b>Data Type<br>
 </b>Choose the type of form element for this field.<b><br>
 <br>
@@ -305,7 +305,7 @@ information about the content, and is defined in terms of property-value pairs.<
 <p>In the example <b>source: newspaper</b>, this metadata has a <i>property</i> named
 <i>source</i> with a <i>value</i> of <i>newspaper</i>.</p>
 <p>Metadata properties are defined globally, while Metadata values are set for
-each wobject under the tab &quot;Metadata&quot; in the wobject properties.</p>
+each asset under the tab &quot;Meta&quot; in the asset properties.</p>
 <p>Before you can use metadata in WebGUI, you'll have to switch the &quot;Enable Metadata
 ?&quot; setting to Yes in the Manage Settings menu.</p>
 <p>Usage of metadata:</p>
@@ -330,9 +330,15 @@ each wobject under the tab &quot;Metadata&quot; in the wobject properties.</p>
     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:<br>
     type = &#94;AOIRank(contenttype);</p></li>
+	<li><p><b>Display</b><br />
+	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 &lt;tmpl_var <i>propertyname</i>&gt;</p></li>
+	<li><p><b>Meta tags</b><br />
+	Since the meta data is exposed as template variables, you can use that in combination with the &#94;RawHeadTags();
+	macro to create meta tags from meta data, including the tags from the Dublin Core standard.</p></li>
 </ul>|,
                 context => q|Metadata help|,
-                lastUpdated => 1099530955
+                lastUpdated => 1110530955
         },
 
 	'Metadata, Edit property' => {

www/extras/assetManager/AssetManager.js

@@ -294,4 +294,4 @@ function AssetManager_sortGrid(columnIndex) {
 		tableBody.appendChild(rowArray[i]);	
 	}		
 }
-	
+