r1485 - xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-01 18:23:44 +0100 (Wed, 01 Nov 2006)
New Revision: 1485

Modified:
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
Log:
[GELC]
* set the creator of the asset
* regenerate the asset name when we publish the asset

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-10-31 17:44:38 UTC (rev 1484)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-01 17:23:44 UTC (rev 1485)
@@ -82,6 +82,7 @@
         asset.setContent("#includeForm(\"XWiki.AssetTemplate\")");
         XWikiDocument doc = asset.getDocument();
         doc.setAuthor(context.getUser());
+        doc.setCreator(context.getUser());
         protectAssetPage(asset, context);
         return asset;
     }
@@ -95,7 +96,11 @@
 
     public Asset publishAsset(Asset asset, String collection, XWikiContext context) throws XWikiException {
         if (isComplet(asset, context) && asset.hasAccessLevel("edit") && hasPublishingRight(collection, context)){
-            String fullName = collection + "." + asset.getName();
+            asset.use(ASSET_CLASS_FULLNAME);
+            String title = (String) asset.get(ASSET_ITEM_TITLE);
+
+            String distName = context.getWiki().getUniquePageName(collection, title, context);
+            String fullName = collection + "." + distName;
             context.getWiki().renamePage(context.getWiki().getDocument(asset.getFullName(), context), fullName, context);
             asset = (Asset) context.getWiki().getDocument(fullName, context).newDocument(context);
             protectPublishedAsset(asset, context);