r1015 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/template/xhtml tld - Wikitty-commits

30 Jun 2011

Author: mfortun
Date: 2011-06-30 17:57:55 +0200 (Thu, 30 Jun 2011)
New Revision: 1015

Url: http://nuiton.org/repositories/revision/wikitty/1015

Log:
* correct bug due to new name for "name" attribut
* descfield finally not required
* disable orderBefore still need correction.

Modified:
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl
   trunk/wikitty-struts/src/main/tld/wikitty-struts.tld

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java
===================================================================

--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java	2011-06-30 15:57:55 UTC (rev 1015)
@@ -107,13 +107,8 @@
 
         }
         
+   
         
-        
-     
-        
-        System.out.println(wikittyFieldMap);
-    
-        
         return SUCCESS;
     }
     
@@ -156,7 +151,7 @@
                     result += t;
                 }
             } else {
-                result = temp.toString();
+                result = temp.toString();   
 
             }
 

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java	2011-06-30 15:57:55 UTC (rev 1015)
@@ -28,7 +28,7 @@
     protected String exclude = "";
     protected String order = "";
 
-    protected Boolean orderBefore;
+    protected Boolean orderBefore = false;
     protected Set<String> fieldAdded;
 
     protected Map<String, List<String>> excludeMap;
@@ -111,7 +111,9 @@
 
         // if order before selected and none field add, prepare the field list
         // with another method
+        
         if (orderBefore && (fieldAdded.size() == 0)) {
+            System.out.println("chaucette");
             return getFieldOrderedBefore();
         }
 
@@ -296,8 +298,8 @@
                         extName).contains(fieldName));
 
         // check if field is specifically included or if all the extention is
-        boolean notIncluded = !(includeEnable
-                && includeMap.containsKey(extName) && (includeMap.get(extName)
+        boolean notIncluded =  includeEnable 
+                &&  !(includeMap.containsKey(extName) && (includeMap.get(extName)
                 .contains("*") || includeMap.get(extName).contains(fieldName)));
         // check if field allready added
         boolean added = fieldAdded.contains(extName + "." + fieldName);
@@ -306,6 +308,8 @@
                 + "notInclude:" + notIncluded + " exclude:" + excluded
                 + " alreadyAdd:" + added);
 
+
+        
         if (excluded || notIncluded || added) {
             return false;
         }

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java	2011-06-30 15:57:55 UTC (rev 1015)
@@ -53,7 +53,7 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
         if ( fqFieldName !=null) {
-        addParameter("fqFieldName", findValue(fqFieldName));
+        addParameter("fqFieldName", fqFieldName);
         }
     }
 

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java	2011-06-30 15:57:55 UTC (rev 1015)
@@ -35,13 +35,17 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
+        
         // if field defined as inclued
-        if (handler.isIncluded(name)) {
+        if (handler.isIncluded(fqFieldName)) {
+            
 
-            handler.addAddedField(name);
+            
 
+            handler.addAddedField(fqFieldName);
+
             // parse extname and field name
-            String[] fieldsAccess = StringUtil.split(name, ".");
+            String[] fieldsAccess = StringUtil.split(fqFieldName, ".");
             // add parametters to be use by the template
             addParameter("included", true);
             addParameter(
@@ -75,7 +79,7 @@
                             String[] descTable = StringUtil.split(descriptorIt,
                                     ".");
 
-                            desc += wiki.getFieldAsString(descTable[0],
+                            desc += wiki.getFieldAsWikitty(descTable[0],
                                     descTable[1]);
                         }
                     }

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java	2011-06-30 15:57:55 UTC (rev 1015)
@@ -109,6 +109,7 @@
         log.info("add wikitty fields to the parametters");
         addParameter("wikittyfields", handler.getWikittyField());
 
+
     }
 
     public String getDefaultOpenTemplate() {

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl	2011-06-30 15:57:55 UTC (rev 1015)
@@ -1,5 +1,5 @@
 <#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" <#t/>
+${parameters.label} : <input type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/>
 	<#if  aKey.value=="true" >   <#t/>
 		checked='true'<#t/>
 	</#if> 

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl	2011-06-30 15:57:55 UTC (rev 1015)
@@ -1,5 +1,5 @@
 <#if parameters.included?? && parameters.included==true >
-${parameters.label} :<select name="${parameters.name}" size="1">
+${parameters.label} :<select name="${parameters.fqFieldName}" size="1">
 <#assign optionKeys = parameters.fixvalues><#t/>
     <#list optionKeys as optionKey><#t/>
 	<option value="${optionKey.valeur}" <#t/> 

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl	2011-06-30 15:57:55 UTC (rev 1015)
@@ -1,3 +1,3 @@
 <#if parameters.included?? && parameters.included==true >
-<input type="hidden" name="${parameters.name}" value="${parameters.value}" /><#t/>
+<input type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/>
 </#if>
\ No newline at end of file

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl	2011-06-30 15:57:55 UTC (rev 1015)
@@ -1,3 +1,3 @@
 <#if parameters.included?? && parameters.included==true >
-${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea><#t/>
+${parameters.label} : <textarea id="${parameters.fqFieldName}" cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/>
 </#if><#t/>
\ No newline at end of file

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl	2011-06-30 15:57:55 UTC (rev 1015)
@@ -1,3 +1,3 @@
 <#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" ><#t/> 
+${parameters.label} : <input type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/> 
 </#if><#t/> 
\ No newline at end of file

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl	2011-06-30 15:57:55 UTC (rev 1015)
@@ -1,5 +1,5 @@
 <#if parameters.included?? && parameters.included==true >
-${parameters.label} :<select name="${parameters.name}" size="1">
+${parameters.label} :<select name="${parameters.fqFieldName}" size="1">
 <#assign optionKeys = parameters.wikittiesvalues>
     <#list optionKeys as optionKey>
 	<option value="${optionKey.valeur}"<#t/>

Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld	2011-06-30 14:51:03 UTC (rev 1014)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld	2011-06-30 15:57:55 UTC (rev 1015)
@@ -85,9 +85,8 @@
         </attribute>
         <attribute>
             <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description>
-            <name>descfields</name>
+            <name>descfield</name>
             <rtexprvalue>true</rtexprvalue>
-            <required>true</required>
         </attribute>
         <attribute>
             <description><![CDATA[the name of the field that have to be specialize]]></description>

    

r1015 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/template/xhtml tld

mfortun＠users.nuiton.org

tags

participants (1)