From 1b0a0a477cbd40cfd9430dddc56155c845d17dd5 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Tue, 18 Sep 2007 21:31:24 +0000
Subject: [PATCH] fix: Made it possible to import exported collateral asset
 data

---
 docs/changelog/7.x.x.txt   |  2 ++
 lib/WebGUI/AssetPackage.pm | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e21b2c9ea..62d8f931f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,8 @@
  - add type variable to Data Form record loop
  - fix: Select All button javascript would not work in IE
  - fix: Events were missing startDateMonth and endDateMonth template vars
+ - fix: Fixed a bug which caused assets to be uneditable if their edit group 
+   had been deleted. (Martin Kamerbeek / Oqapi)
  - fix: Events don't display on last day of week on week view
 
 7.4.6
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index f395ca893..983acce7e 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -161,6 +161,22 @@ sub importAssetData {
 
 #-------------------------------------------------------------------
 
+=head2 importAssetCollateralData ( data )
+
+Allows you to import collateral data that is exported with your asset. 
+
+=head3 data
+
+Hashref containing the assets exported data.
+
+=cut
+
+sub importAssetCollateralData {
+    # This is an interface method only. It is to be overloaded if needed.
+}
+
+#-------------------------------------------------------------------
+
 =head2 importPackage ( storageLocation )
 
 Imports the data from a webgui package file.
@@ -196,6 +212,7 @@ sub importPackage {
 		}
 		my $asset = $assets{$data->{properties}{parentId}} || $self;
 		my $newAsset = $asset->importAssetData($data);
+        $newAsset->importAssetCollateralData($data);
 		$assets{$newAsset->getId} = $newAsset;
 	}
 	if ($self->session->setting->get("autoRequestCommit")) {