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

29 Jun 2011

Author: mfortun
Date: 2011-06-29 10:50:09 +0200 (Wed, 29 Jun 2011)
New Revision: 991

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

Log:
* work on ordering before or after specific field


Added:
   trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl
Modified:
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java
   trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl

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

--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java	2011-06-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java	2011-06-29 08:50:09 UTC (rev 991)
@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
+
 public class ExtensionFieldStrutsBean {
 
     

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java	2011-06-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java	2011-06-29 08:50:09 UTC (rev 991)
@@ -7,6 +7,7 @@
 import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
+
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false)

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java	2011-06-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java	2011-06-29 08:50:09 UTC (rev 991)
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,10 @@
     protected String include = "";
     protected String exclude = "";
     protected String order = "";
+    
+    protected Boolean orderBefore;
+
+
     protected Map<String, FieldSpecialisation> field;
     protected Set<String> fieldAdded;
    
@@ -38,6 +43,7 @@
 
     public WikittyFieldHandler() {
         field = new HashMap<String, FieldSpecialisation>();
+        fieldAdded = new HashSet<String>();
     }
 
     public Wikitty getWikitty() {
@@ -48,6 +54,14 @@
         this.wikitty = wikitty;
     }
 
+    public Boolean getOrderBefore() {
+        return orderBefore;
+    }
+
+    public void setOrderBefore(Boolean orderBefore) {
+        this.orderBefore = orderBefore;
+    }    
+    
     public WikittyProxy getProxy() {
         return proxy;
     }
@@ -134,7 +148,7 @@
                 if ((excludeMap.containsKey(extName) && excludeMap.get(extName)
                         .contains(fieldName))
                         || (includeEnable && !includeMap.get(extName).contains(
-                                fieldName)) || fieldAdded.contains(fieldName)) {
+                                fieldName)) || fieldAdded.contains(extName+"."+fieldName)) {
                     continue;
 
                 }

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-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java	2011-06-29 08:50:09 UTC (rev 991)
@@ -6,6 +6,7 @@
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.wikitty.WikittyProxy;
 import org.nuiton.wikitty.entities.Wikitty;
+
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag",
@@ -24,9 +25,29 @@
 
     protected String include;
     protected String exclude;
+        
     protected String order;
+    protected Boolean orderBefore;
+    
     protected Boolean allowDelete;
+    
 
+    public Boolean getOrderBefore() {
+        return orderBefore;
+    }
+
+    public void setOrderBefore(Boolean orderBefore) {
+        this.orderBefore = orderBefore;
+    }
+
+    public Boolean getAllowDelete() {
+        return allowDelete;
+    }
+
+    public void setAllowDelete(Boolean allowDelete) {
+        this.allowDelete = allowDelete;
+    }
+
     public WikittyTagBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
@@ -48,6 +69,10 @@
         if (allowDelete != null) {
             addParameter("allowDelete", allowDelete);
         }
+        
+        if (orderBefore!=null) {
+            addParameter("orderBefore", orderBefore);
+        }
 
         if (wikitty != null) {
             addParameter("wikittyid", findString(wikitty.getId()));
@@ -67,12 +92,12 @@
             handler.setOrder(order);
             handler.setWikitty(wikitty);
             handler.setProxy(proxy);
+            handler.setOrderBefore(orderBefore);
 
         } else {
-            handler = (WikittyFieldHandler) temp;
-            addParameter("wikittyfields", handler.getWikittyField());
+        handler = (WikittyFieldHandler) temp;
         }
-
+        addParameter("wikittyfields", handler.getWikittyField());
         /*
          * 
          * si l'élément key est null on l'initialise en y mettant tout les

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java	2011-06-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java	2011-06-29 08:50:09 UTC (rev 991)
@@ -20,12 +20,20 @@
     protected WikittyProxy proxy;
     protected String action;
     protected String redirect;
-
     protected String include;
     protected String exclude;
     protected String order;
     protected boolean allowDelete;
+    protected boolean orderBefore;
 
+    public boolean isOrderBefore() {
+        return orderBefore;
+    }
+
+    public void setOrderBefore(boolean orderBefore) {
+        this.orderBefore = orderBefore;
+    }
+
     public String getInclude() {
         return include;
     }
@@ -74,6 +82,7 @@
         wikittyTag.setWikitty(wikitty);
         wikittyTag.setProxy(proxy);
         wikittyTag.setOrder(order);
+        wikittyTag.setOrderBefore(orderBefore);
         wikittyTag.setAllowDelete(allowDelete);
         wikittyTag.setInclude(include);
         wikittyTag.setExclude(exclude);

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl	2011-06-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl	2011-06-29 08:50:09 UTC (rev 991)
@@ -1,58 +1,4 @@
-
-<#assign aKeys = parameters.wikittyfields><#t/>
-    <#list aKeys as aKey><#t/>
- 
-<#if  aKey.type=="file">
-<input type="hidden" name="${aKey.name}" value="BINARY" />
-${aKey.label} : <input type="file" name="File" label ="File"/>
-</#if>
-
-<#if  aKey.type=="hidden">
-<input type="hidden" name="${aKey.name}" value="${aKey.value}" />
-</#if>
-
-
-<#if  aKey.type=="textarea" >
-${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
-</#if>
-<#if  aKey.type=="textfield" >
-${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" >
-</#if>
-
-<#if  aKey.type=="boolean" >                            
-${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" 
-	<#if  aKey.value=="true" >   
-		checked='true'
-	</#if> 
- />                          
-</#if>      
-<#--
-
--->
-<#if  aKey.type=="select" >
-${aKey.label} :
-<select name="${aKey.name}" size="1">
-<#assign optionKeys = aKey.listOption><#t/>
-    <#list optionKeys as optionKey><#t/>
-	<option value="${optionKey.valeur}"
-	<#if  optionKey.valeur==aKey.value >
-		selected
-	</#if>
-	> ${optionKey.description} </option>
-	</#list><#t/> 
-
-</select>
-</#if>
-
-
-
-
-
-
-</br>
-</#list><#t/> 
-
-
+<#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" />
 <input type="submit" name="store" value="Store" />
 <#if parameters.allowDelete?? && parameters.allowDelete==true >
 <input type="submit" name="delete" value="Delete" />

Added: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl	                        (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl	2011-06-29 08:50:09 UTC (rev 991)
@@ -0,0 +1,47 @@
+
+<#assign aKeys = parameters.wikittyfields><#t/>
+    <#list aKeys as aKey><#t/>
+ 
+<#if  aKey.type=="file">
+<input type="hidden" name="${aKey.name}" value="BINARY" />
+${aKey.label} : <input type="file" name="File" label ="File"/>
+</#if>
+
+<#if  aKey.type=="hidden">
+<input type="hidden" name="${aKey.name}" value="${aKey.value}" />
+</#if>
+
+
+<#if  aKey.type=="textarea" >
+${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
+</#if>
+<#if  aKey.type=="textfield" >
+${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" >
+</#if>
+
+<#if  aKey.type=="boolean" >                            
+${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" 
+	<#if  aKey.value=="true" >   
+		checked='true'
+	</#if> 
+ />                          
+</#if>      
+<#--
+
+-->
+<#if  aKey.type=="select" >
+${aKey.label} :
+<select name="${aKey.name}" size="1">
+<#assign optionKeys = aKey.listOption><#t/>
+    <#list optionKeys as optionKey><#t/>
+	<option value="${optionKey.valeur}"
+	<#if  optionKey.valeur==aKey.value >
+		selected
+	</#if>
+	> ${optionKey.description} </option>
+	</#list><#t/> 
+
+</select>
+</#if>
+</br>
+</#list><#t/> 

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl	2011-06-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl	2011-06-29 08:50:09 UTC (rev 991)
@@ -4,4 +4,9 @@
 <input type="hidden" name="extensions" value="${parameters.wikittyextensions}"/>
 <#if parameters.redirect??>
 <input type="hidden" name="redirect" value="${parameters.redirect}" />
-</#if>
\ No newline at end of file
+</#if>
+<#if parameters.orderBefore?? && parameters.orderBefore==true >
+<#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" />
+</#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-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl	2011-06-29 08:50:09 UTC (rev 991)
@@ -2,11 +2,11 @@
 ${parameters.label} :<select name="${parameters.name}" size="1">
 <#assign optionKeys = parameters.fixvalues><#t/>
     <#list optionKeys as optionKey><#t/>
-	<option value="${optionKey.valeur}"
+	<option value="${optionKey.valeur}" <#t/> 
 	<#if  optionKey.valeur==parameters.value >
-		selected
-	</#if>
+		selected <#t/> 
+	</#if> <#t/> 
 	> ${optionKey.description} </option>
-	</#list><#t/> 
-</select>
+	</#list>
+</select><#t/> 
 </#if>
\ 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-28 16:20:28 UTC (rev 990)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl	2011-06-29 08:50:09 UTC (rev 991)
@@ -1,3 +1,3 @@
-<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" >
-</#if>
\ No newline at end of file
+<#if parameters.included?? && parameters.included==true ><#t/> 
+${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" ><#t/> 
+</#if><#t/> 
\ No newline at end of file

    

r991 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component org/nuiton/wikitty/struts/tag template/xhtml

mfortun＠users.nuiton.org

tags

participants (1)