Author: dward
Date: 2007-11-20 18:06:40 +0100 (Tue, 20 Nov 2007)
New Revision: 6037
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
Log:
- CURRIKI-1150
- Keywords are now inherited
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
2007-11-20 16:08:06 UTC (rev 6036)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/Constants.java
2007-11-20 17:06:40 UTC (rev 6037)
@@ -52,6 +52,7 @@
public static final String ASSET_CATEGORY_PROPERTY = "category";
public static final String ASSET_FW_ITEMS_PROPERTY = "fw_items";
public static final String ASSET_DESCRIPTION_PROPERTY = "description";
+ public static final String ASSET_KEYWORDS_PROPERTY = "keywords";
public static final String ASSET_EDUCATIONAL_LEVEL_PROPERTY =
"educational_level2";
public static final String ASSET_LANGUAGE_PROPERTY = "language";
public static final String ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY =
"instructional_component2";
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
2007-11-20 16:08:06 UTC (rev 6036)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
2007-11-20 17:06:40 UTC (rev 6037)
@@ -834,10 +834,9 @@
BaseObject parentObjAsset = (BaseObject)
compositeAssetDoc.getObject(Constants.ASSET_CLASS).clone();
copyProperty(parentObjAsset, newObjAsset,
Constants.ASSET_EDUCATIONAL_LEVEL_PROPERTY);
-
copyProperty(parentObjAsset, newObjAsset,
Constants.ASSET_FW_ITEMS_PROPERTY);
-
copyProperty(parentObjAsset, newObjAsset,
Constants.ASSET_RIGHTS_PROPERTY);
+ copyProperty(parentObjAsset, newObjAsset,
Constants.ASSET_KEYWORDS_PROPERTY);
}
// let's make sure default value is not empty
@@ -943,6 +942,7 @@
mergeProperty(parentObjAsset, newObjAsset,
Constants.ASSET_EDUCATIONAL_LEVEL_PROPERTY);
mergeProperty(parentObjAsset, newObjAsset,
Constants.ASSET_FW_ITEMS_PROPERTY);
copyProperty(parentObjAsset, newObjAsset,
Constants.ASSET_RIGHTS_PROPERTY);
+ mergeProperty(parentObjAsset, newObjAsset,
Constants.ASSET_KEYWORDS_PROPERTY);
}
// let's make sure default value is not empty
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
