r1362 - in xwiki/trunk/src/main/java/com/xpn/xwiki: doc objects/classes

[Jean-Vincent Drean]

Author: jvdrean
Date: 2006-10-04 16:12:31 +0200 (Wed, 04 Oct 2006)
New Revision: 1362

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
Log:
Fixed bug : display type (view, edit, etc) used in properties custom displayer is now depending on call and not on context action.

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-10-04 13:55:35 UTC (rev 1361)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-10-04 14:12:31 UTC (rev 1362)
@@ -947,7 +947,7 @@
             String prefix = obj.getxWikiClass(context).getName() + "_" + obj.getNumber() + "_";
 
             if (pclass.isCustomDisplayed(context)){
-                pclass.displayCustom(result, fieldname, prefix, obj, context);  
+                pclass.displayCustom(result, fieldname, prefix, type, obj, context);  
             }
             else if (type.equals("view")) {
                 pclass.displayView(result, fieldname, prefix, obj, context);

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java	2006-10-04 13:55:35 UTC (rev 1361)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java	2006-10-04 14:12:31 UTC (rev 1362)
@@ -200,7 +200,7 @@
         return disp != null && disp.length() > 0;
     }
 
-    public void displayCustom(StringBuffer buffer, String fieldName, String prefix, BaseObject object, XWikiContext context) throws XWikiException {
+    public void displayCustom(StringBuffer buffer, String fieldName, String prefix, String type, BaseObject object, XWikiContext context) throws XWikiException {
         String content = getCustomDisplay();
 
         try {
@@ -208,7 +208,7 @@
             vcontext.put("name", fieldName);
             vcontext.put("prefix", prefix);
             vcontext.put("object", new com.xpn.xwiki.api.Object(object, context));
-            vcontext.put("type", context.getAction());
+            vcontext.put("type", type);
             vcontext.put("context", new com.xpn.xwiki.api.Context(context));
 
             BaseProperty prop = (BaseProperty) object.safeget(fieldName);