Menu
▾
▴
equanda-svn-commit — svn commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
(41) |
Sep
(44) |
Oct
(31) |
Nov
(54) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(71) |
Feb
(66) |
Mar
(65) |
Apr
(73) |
May
(68) |
Jun
(69) |
Jul
(28) |
Aug
(49) |
Sep
(44) |
Oct
(77) |
Nov
(64) |
Dec
(78) |
| 2009 |
Jan
(50) |
Feb
(28) |
Mar
(41) |
Apr
(30) |
May
(5) |
Jun
(30) |
Jul
(6) |
Aug
(2) |
Sep
(18) |
Oct
(11) |
Nov
(6) |
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(8) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vla...@us...> - 2009-01-19 16:22:31
|
Revision: 984
http://equanda.svn.sourceforge.net/equanda/?rev=984&view=rev
Author: vladimirt
Date: 2009-01-19 16:22:25 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
Small fix in ObjectCreatorDelegate
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/ObjectCreatorDelegate.java
Property Changed:
----------------
trunk/
trunk/equanda-client/
trunk/equanda-dm/
trunk/equanda-generate/
trunk/equanda-server/
trunk/equanda-t5gui/
trunk/equanda-tapestry5/
trunk/equanda-test/
trunk/equanda-test/test-core/
trunk/equanda-test/test-ddltool/
trunk/equanda-test/test-t5-ear/
trunk/equanda-test/test-t5-gui/
trunk/equanda-test/test-test/
trunk/equanda-tool/
trunk/equanda-util/
Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
+ target
.project
clean-install.cmd
Property changes on: trunk/equanda-client
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.classpath
.project
Property changes on: trunk/equanda-dm
___________________________________________________________________
Added: svn:ignore
+ .settings
target
.classpath
.project
Property changes on: trunk/equanda-generate
___________________________________________________________________
Added: svn:ignore
+ .settings
target
.classpath
.project
errors.txt
clean-install.cmd
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm 2009-01-19 16:18:58 UTC (rev 983)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm 2009-01-19 16:22:25 UTC (rev 984)
@@ -63,7 +63,7 @@
*/
public class InlineLinkList
extends AbstractField
- implements ObjectCreatorDelegate
+ implements ObjectCreatorDelegate<${table.Name}>
{
private static final Logger log = Logger.getLogger( InlineLinkList.class );
private static final StringTranslator STRING_TRANSLATOR = new StringTranslator();
@@ -219,10 +219,10 @@
return null;
}
- public void addNewObject( Object object ){
+ public void addNewObject( ${table.Name} object ){
if ( value != null )
{
- value.add( (${table.Name})object );
+ value.add( object );
}
else
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm 2009-01-19 16:18:58 UTC (rev 983)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm 2009-01-19 16:22:25 UTC (rev 984)
@@ -59,7 +59,7 @@
*/
public class InlinePrimitiveList
extends AbstractField
- implements ObjectCreatorDelegate
+ implements ObjectCreatorDelegate<Object>
{
private static final Logger log = Logger.getLogger( InlinePrimitiveList.class );
private static final StringTranslator STRING_TRANSLATOR = new StringTranslator();
Property changes on: trunk/equanda-server
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.classpath
.project
Property changes on: trunk/equanda-t5gui
___________________________________________________________________
Added: svn:ignore
+ .settings
target
.classpath
.project
Property changes on: trunk/equanda-tapestry5
___________________________________________________________________
Added: svn:ignore
+ .settings
target
.classpath
.project
clean-install.cmd
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/ObjectCreatorDelegate.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/ObjectCreatorDelegate.java 2009-01-19 16:18:58 UTC (rev 983)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/ObjectCreatorDelegate.java 2009-01-19 16:22:25 UTC (rev 984)
@@ -24,9 +24,9 @@
package org.equanda.tapestry5.base;
-public interface ObjectCreatorDelegate
+public interface ObjectCreatorDelegate<T>
{
- public abstract Object createObject();
+ public abstract T createObject();
- public abstract void addNewObject( Object object );
+ public abstract void addNewObject( T object );
}
Property changes on: trunk/equanda-test
___________________________________________________________________
Added: svn:ignore
+ velocity.log
Property changes on: trunk/equanda-test/test-core
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/equanda-test/test-ddltool
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/equanda-test/test-t5-ear
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/equanda-test/test-t5-gui
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/equanda-test/test-test
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/equanda-tool
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.classpath
.project
Property changes on: trunk/equanda-util
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.classpath
.project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2009-01-19 16:19:03
|
Revision: 983
http://equanda.svn.sourceforge.net/equanda/?rev=983&view=rev
Author: vladimirt
Date: 2009-01-19 16:18:58 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
fixed JSPagedLoop example
Modified Paths:
--------------
t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java
t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
Modified: t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java
===================================================================
--- t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java 2009-01-19 14:04:13 UTC (rev 982)
+++ t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java 2009-01-19 16:18:58 UTC (rev 983)
@@ -27,6 +27,8 @@
import org.apache.tapestry5.Asset;
import org.apache.tapestry5.Block;
import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.SetupRender;
import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.example.t5.data.DemoTree;
@@ -41,7 +43,7 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class Start
+public class Start /*implements ObjectCreatorDelegate<String>*/
{
@Inject
@Path( "context:images/smiley.gif" )
@@ -50,8 +52,31 @@
/** Current node of the tree. */
private Tree node;
+ @Persist
private List<String> list;
private String current;
+
+ @SetupRender
+ void setupRender()
+ {
+ if ( null == list )
+ {
+ list = new ArrayList<String>();
+ list.add( "We" );
+ list.add( "need" );
+ list.add( "a" );
+ list.add( "long" );
+ list.add( "list" );
+ list.add( "of" );
+ list.add( "items" );
+ list.add( "to" );
+ list.add( "show" );
+ list.add( "the" );
+ list.add( "paging" );
+ list.add( "in" );
+ list.add( "action." );
+ }
+ }
public Tree getNode()
{
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml 2009-01-19 14:04:13 UTC (rev 982)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml 2009-01-19 16:18:58 UTC (rev 983)
@@ -4,7 +4,9 @@
<link rel="shortcut icon" href="${favicon}" type="image/x-icon" />
<link type="text/css" rel="stylesheet" href="${style}" />
<script src="${script}" language="javascript" type="text/javascript" />
- <style id="applicationStyles"></style>
+ <style id="applicationStyles">
+ p {} /* Empty style for probable Tapestry render bug */
+ </style>
</head>
<body>
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2009-01-19 14:04:13 UTC (rev 982)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2009-01-19 16:18:58 UTC (rev 983)
@@ -106,11 +106,13 @@
fully handled client side.</p>
<br/>
+ <t:form>
<ul>
- <div t:type="equanda/JSPagedLoop" source="list" value="current" addRowLinkTitle="Add" >
+ <div t:id="pagedLoop" t:type="equanda/JSPagedLoop" t:source="prop:list" t:value="prop:current" t:rowsPerPage="5" t:additionalRowCount="0">
<li>${current}</li>
</div>
</ul>
+ </t:form>
</t:parameter>
<t:parameter name="title6">TextField</t:parameter>
<t:parameter name="content6">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-19 14:04:19
|
Revision: 982
http://equanda.svn.sourceforge.net/equanda/?rev=982&view=rev
Author: triathlon98
Date: 2009-01-19 14:04:13 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
EQ-318 fix error display during actions
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-01-16 19:17:17 UTC (rev 981)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-01-19 14:04:13 UTC (rev 982)
@@ -43,16 +43,20 @@
import org.equanda.client.EquandaException;
import org.equanda.persistence.EquandaProxy;
import org.equanda.persistence.Uoid;
+import org.equanda.persistence.SelectorsState;
import org.equanda.t5gui.*;
import org.equanda.t5gui.services.EquandaSetterCache;
import org.equanda.tapestry5.data.MessageContainer;
+import org.equanda.util.ExceptionUtil;
+
/**
* Base class for edit page
*/
public abstract class EditPageBase<T extends EquandaProxy>
{
private static final Logger log = Logger.getLogger( EditPageBase.class );
+ private static final String REDIRECT_KEEP_EXCEPTION_KEY = "equanda-redirect-keep-exception";
@Persist
private Object returnPage;
@@ -65,7 +69,7 @@
@Environmental
private ValidationTracker validationTracker;
- private Exception keepException;
+ private String keepException;
@Inject
private Environment environment;
@@ -217,6 +221,7 @@
nextPage = null;
try
{
+ log.info( "going to delete " + getObject() );
getObject().removeEntityBean();
nextPage = returnPage == null ? getAllPage() : returnPage;
}
@@ -242,11 +247,27 @@
public Object delayedError( Exception exc )
{
log.warn( exc, exc );
- keepException = exc;
+ ExceptionUtil eu = new ExceptionUtil( exc );
+ keepException = eu.getConcatenatedMessage();
return null;
}
/**
+ * Log error and display (later) on screen, returns null to allow "return redirectKeepError()".
+ * Special version for use in onActivate.
+ *
+ * @param exc exception to log
+ * @return null
+ */
+ public Object redirectKeepError( Exception exc )
+ {
+ log.warn( exc, exc );
+ ExceptionUtil eu = new ExceptionUtil( exc );
+ SelectorsState.setFilter( REDIRECT_KEEP_EXCEPTION_KEY, eu.getConcatenatedMessage() );
+ return null;
+ }
+
+ /**
* Log error and display on screen, returns null to allow "return error()"
*
* @param exc exception to log
@@ -271,9 +292,14 @@
void beginRender()
{
+ if ( null == keepException)
+ {
+ keepException = SelectorsState.getFilter( REDIRECT_KEEP_EXCEPTION_KEY );
+ SelectorsState.setFilter( REDIRECT_KEEP_EXCEPTION_KEY, null );
+ }
if ( null != keepException )
{
- environment.push( MessageContainer.class, new MessageContainer( keepException.getMessage() ) );
+ environment.push( MessageContainer.class, new MessageContainer( keepException ) );
}
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2009-01-16 19:17:17 UTC (rev 981)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2009-01-19 14:04:13 UTC (rev 982)
@@ -80,7 +80,7 @@
}
catch ( EquandaException epe )
{
- return error( epe );
+ return redirectKeepError( epe );
}
#else
// link to the results page
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2009-01-19 14:04:13 UTC (rev 982)
@@ -41,6 +41,7 @@
#if( !$table.Actions.isEmpty() )
<t:parameter name="actions">
+ <t:if test="isExistingObject()">
<ul>
#foreach( $action in $table.Actions )
<t:if test="equanda-readable:action.${table.Name}.${action.Name}">
@@ -48,6 +49,7 @@
</t:if>
#end
</ul>
+ </t:if>
</t:parameter>
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-16 19:17:28
|
Revision: 981
http://equanda.svn.sourceforge.net/equanda/?rev=981&view=rev
Author: triathlon98
Date: 2009-01-16 19:17:17 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
all loops needs to be volatile, linklist works better without pagedloop, some cleanup
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/string.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -6,7 +6,7 @@
<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
- <div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:if test="isCanAdd()">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -6,7 +6,7 @@
<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
- <div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -5,7 +5,7 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7">
+ <div class="eqLLR" t:type="loop" volatile="true" source="value" value="current" index="index" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
<div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="index" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:equanda.formactionlink></div>
<div class="eqLLRD"><t:${table.VarName}.SummaryEditLink object="current"/></div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -6,7 +6,7 @@
<input t:type="TextField" t:value="literal:?" length="1" disabled="true" style="display:none"/>
<div class="eqLL">
- <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7">
+ <div class="eqLLR" t:type="equanda/JSPagedLoop" volatile="true" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
<div class="eqLLRD"><t:${field.LinkTable.VarName}.SummaryEditLink object="currentMultipleRow"/></div>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -5,7 +5,7 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<!-- @ todo -->
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
${dollar}{currentMultipleRow}
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
<span t:type="ck/DateFormat" value="currentMultipleRow" pattern="dd.MM.yyyy"/>
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
<a href="mailto:${dollar}{currentMultipleRow}">${dollar}{currentMultipleRow}</a>
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -6,7 +6,7 @@
<input t:type="TextField" t:value="literal:?" length="1" disabled="true" style="display:none"/>
<div class="eqLL">
- <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7">
+ <div class="eqLLR" t:type="equanda/JSPagedLoop" volatile="true" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
<div class="eqLLRD"><t:${field.LinkTable.VarName}.SummaryEditLink object="currentMultipleRow"/></div>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/string.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/string.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/string.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
<span t:type="equanda/Truncate" t:text="prop:currentMultipleRow"/>
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
<span t:type="equanda/Truncate" t:text="value.${field.VarName}"/>
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
<span t:type="ck/DateFormat" value="currentMultipleRow" pattern="dd.MM.yyyy HH:mm:ss"/>
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
${dollar}{currentMultipleRow}
</div>
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm 2009-01-16 19:17:17 UTC (rev 981)
@@ -4,7 +4,7 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<div t:type="Loop" volatile="true" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
<a href="${dollar}{currentMultipleRow}" target="_blank">${dollar}{currentMultipleRow}</a>
</div>
#else
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2009-01-16 19:17:17 UTC (rev 981)
@@ -101,22 +101,12 @@
@Persist
private int currentPage;
- // @Persist
private int addedRowCount;
/** The current value, set before the component renders its body. */
- @SuppressWarnings( "unused" )
@Parameter
private Object value;
- /**
- * If true and the Loop is enclosed by a Form, then the normal state saving logic is turned off. Defaults to false,
- * enabling state saving logic within Forms.
- */
- @SuppressWarnings( "unused" )
- @Parameter
- private boolean volatileLoop;
-
@Parameter( defaultPrefix = BindingConstants.PROP )
private ObjectCreatorDelegate objectCreatorDelegate;
@@ -131,7 +121,6 @@
* Optional primary key converter; if provided and inside a form and not volatile, then each iterated value is
* converted and stored into the form.
*/
- @SuppressWarnings( "unused" )
@Parameter
private PrimaryKeyEncoder<?, ?> encoder;
@@ -170,8 +159,6 @@
private String assignedClientId;
- private List<String> rowIds;
-
private String addedRowCountHiddenName;
static class FormSubmitAction
@@ -299,9 +286,7 @@
public String getCurrentRowId()
{
String newId = renderSupport.allocateClientId( assignedClientId );
- String rowId = String.format( "%s_row_%s", assignedClientId, newId.toLowerCase() );
- rowIds.add( rowId );
- return rowId;
+ return String.format( "%s_row_%s", assignedClientId, newId.toLowerCase() );
}
public String getCurrentPageFieldName()
@@ -360,19 +345,12 @@
Object setupRender()
{
currentPage = 1;
- rowIds = new ArrayList<String>();
assignedClientId = renderSupport.allocateClientId( clientId );
- addedRowsList = new ArrayList<Object>();
+ if ( null == addedRowsList ) addedRowsList = new ArrayList<Object>();
pagedSource = new ArrayList<Object>();
- if ( source != null )
- {
- for ( Object item : source )
- {
- pagedSource.add( item );
- }
- }
+ if ( source != null ) pagedSource.addAll( source );
if ( objectCreatorDelegate != null )
{
@@ -393,8 +371,7 @@
return null;
}
- @BeginRender
- Object begin( MarkupWriter writer )
+ Object beginRender()
{
environment.push( JSPagedLoop.class, this );
@@ -404,14 +381,12 @@
}
- @AfterRender
void afterRender()
{
formSupport.storeAndExecute( this, new SetupAction( addedRowHidden.getControlName() ) );
formSupport.store( this, FORM_SUBMIT_ACTION );
}
- @CleanupRender
void cleanupRender()
{
environment.pop( JSPagedLoop.class );
@@ -465,5 +440,4 @@
{
return assignedClientId != null ? assignedClientId.toLowerCase() : "";
}
-
}
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java 2009-01-16 16:18:49 UTC (rev 980)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java 2009-01-16 19:17:17 UTC (rev 981)
@@ -88,15 +88,6 @@
if ( pagedLoop != null )
{
- /*int availableRows = source.size() - pagedLoop.getAddedRowCount();
-
- maxPages = ( ( availableRows - 1 ) / rowsPerPage ) + 1;
-
- if ( maxPages < 2 )
- {
- return;
- }*/
-
String clientId = pagedLoop.getClientId().toLowerCase();
writer.element( "div", "class", "eqplp eqpl_" + clientId );
@@ -106,27 +97,8 @@
showPage( pagedLoop.getCurrentPage(), config, writer );
writer.end();
- /*JSONObject object = new JSONObject();
- object.put( "range", range );
- // object.put( "maxPages", maxPages );
- object.put( "rowsPerPage", rowsPerPage );
- object.put( "lastIndex", 0 );
- object.put( "currentPage", pagedLoop.getCurrentPage() );
- object.put( "rowCount", source.size() );
- object.put( "addedRowCount", pagedLoop.getAddedRowCount() );
- object.put( "additionalRowCount", pagedLoop.getAdditionalRowCount() );
- object.put( "currentPageFieldName", pagedLoop.getCurrentPageFieldName() );
- object.put( "addedRowFieldName", pagedLoop.getAddedRowFieldName() );
- object.put( "containerClass", "eqpl_" + clientId );
- object.put( "rowClass", "eqplr_" + clientId );
- object.put( "addLinkClass", "eqplal_" + clientId );
- object.put( "addBlockClass", "eqplab_" + clientId );
- object.put( "name", clientId );
- renderSupport.addScript( "eqJsplC.%s = %s;", clientId, object );*/
renderSupport.addScript( "eqJsplC.%s = %s;", clientId, config.getJSONObject() );
- // renderSupport.addScript( "eqShwPg( %s, eqJsplC.%s );", pagedLoop.getCurrentPage(), clientId );
renderSupport.addScript( "eqChAL( eqJsplC.%s );", clientId );
- // logger.info( String.format( "Config Object. %s = %s ", clientId, object ) );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-16 16:18:53
|
Revision: 980
http://equanda.svn.sourceforge.net/equanda/?rev=980&view=rev
Author: triathlon98
Date: 2009-01-16 16:18:49 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
Edit component should not use FormFragment as this does not work inside a loop.
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2009-01-15 11:44:16 UTC (rev 979)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div id="${clientId}" class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<t:if test="equanda-readable:table.${table.Name}">
#parse( "t5gui/render.vm" )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2009-01-15 11:44:16 UTC (rev 979)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2009-01-16 16:18:49 UTC (rev 980)
@@ -44,15 +44,19 @@
</t:if>
<t:if test="isIncludeShow()">
<div id="${dollar}{clientId}show${page.Name}" style="${showStyle}">
+<div>
#set( $readOnlyContext = true )
#pageContent()
</div>
+</div>
</t:if>
<t:if test="isIncludeEdit()">
-<div id="${dollar}{clientId}edit${page.Name}" t:type="equanda/FormFragment" visible="isEditMode()">
+<div id="${dollar}{clientId}edit${page.Name}" style="${editStyle}">
+<div>
#set( $readOnlyContext = false )
#pageContent()
</div>
+</div>
</t:if>
</t:parameter>
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js 2009-01-15 11:44:16 UTC (rev 979)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js 2009-01-16 16:18:49 UTC (rev 980)
@@ -163,16 +163,14 @@
{
$( clientId + 'te' + page ).style.display = 'none';
$( clientId + 'ts' + page ).style.display = 'block';
- if ( Prototype.Browser.IE ) Effect.Fade( $( clientId + 'show' + page ) );
- else Effect.SlideUp( $( clientId + 'show' + page ) );
- var ffname = clientId + 'edit' + page;
- if ( !$T( ffname ).formFragment ) new Tapestry.FormFragment( ffname );
if ( Prototype.Browser.IE )
- {
- $T( ffname ).formFragment.showFunc = Tapestry.ElementEffect.show;
- $T( ffname ).formFragment.hideFunc = Tapestry.ElementEffect.fade;
- }
- $T( ffname ).formFragment.setVisible( true );
+ {
+ Effect.Fade( $( clientId + 'show' + page ) );
+ Effect.Appear( $( clientId + 'edit' + page ) );
+ } else {
+ Effect.SlideUp( $( clientId + 'show' + page ) );
+ Effect.SlideDown( $( clientId + 'edit' + page ) );
+ }
}
/**
@@ -185,16 +183,13 @@
{
$( clientId + 'te' + page ).style.display = 'block';
$( clientId + 'ts' + page ).style.display = 'none';
- var ffname = clientId + 'edit' + page;
- if ( !$T( ffname ).formFragment ) new Tapestry.FormFragment( ffname );
- if ( Prototype.Browser.IE )
- {
- $T( ffname ).formFragment.showFunc = Tapestry.ElementEffect.show;
- $T( ffname ).formFragment.hideFunc = Tapestry.ElementEffect.fade;
- }
- $T( ffname ).formFragment.setVisible( false );
- if ( Prototype.Browser.IE ) Effect.Appear( $( clientId + 'show' + page ) );//$( clientId + 'show' + page ).style.display = 'block';
- else Effect.SlideDown( $( clientId + 'show' + page ) );
-
+ if ( Prototype.Browser.IE )
+ {
+ Effect.Fade( $( clientId + 'edit' + page ) );
+ Effect.Appear( $( clientId + 'show' + page ) );
+ } else {
+ Effect.SlideUp( $( clientId + 'edit' + page ) );
+ Effect.SlideDown( $( clientId + 'show' + page ) );
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-15 12:56:12
|
Revision: 979
http://equanda.svn.sourceforge.net/equanda/?rev=979&view=rev
Author: triathlon98
Date: 2009-01-15 11:44:16 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
update for chenillekit use
Modified Paths:
--------------
t5-equanda-example/pom.xml
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2009-01-15 09:43:38 UTC (rev 978)
+++ t5-equanda-example/pom.xml 2009-01-15 11:44:16 UTC (rev 979)
@@ -31,9 +31,9 @@
<version>${equanda-release-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
- <version>${t5compo-release-version}</version>
+ <groupId>org.chenillekit</groupId>
+ <artifactId>chenillekit-tapestry</artifactId>
+ <version>${chenillekit-version}</version>
</dependency>
</dependencies>
@@ -116,10 +116,9 @@
<url>http://maven.progs.be/m2repo</url>
</repository>
<repository>
- <id>t5components</id>
- <name>T5Components Maven Repository</name>
- <url>http://87.193.218.134:8080/t5components/maven-repository</url>
- </repository>
+ <id>chenillekit</id>
+ <url>http://www.chenillekit.org/mvnrepo/release</url>
+ </repository>
<repository>
<id>codehaus.snapshots</id>
<url>http://snapshots.repository.codehaus.org</url>
@@ -147,6 +146,6 @@
<properties>
<equanda-release-version>0.9.2-SNAPSHOT</equanda-release-version>
<tapestry-release-version>5.0.18</tapestry-release-version>
- <t5compo-release-version>0.5.18</t5compo-release-version>
+ <chenillekit-version>1.0.0</chenillekit-version>
</properties>
</project>
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2009-01-15 09:43:38 UTC (rev 978)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2009-01-15 11:44:16 UTC (rev 979)
@@ -7,8 +7,8 @@
<span id="context">t5-equanda-example</span>
</t:parameter>
- <p>This is the example for the <a href="http://equanda.org/equanda-tapesty5/">tapestry5 component</a> which are part
- of <a href="http://equanda.org">equanda</a>.</p>
+ <p>This is the example for the <a href="http://equanda.org/equanda-tapesty5/">tapestry5 components</a> which are
+ part of <a href="http://equanda.org">equanda</a>.</p>
<p>Invisible, but not less useful, is the <em>FormTraverse</em> component which makes the it possible to use the
site without mouse. There is a tight integration between the FormTraverse and Tabs components, which makes
switching between tab pages automatic when pressing tab.
@@ -50,7 +50,7 @@
<t:parameter name="title5">Help</t:parameter>
<t:parameter name="content5">
<div>
- <p>This is the <a href="http://equanda.org">equanda</a> <a href="http://equanda.org/equanda-tapesty5/">tapestry5 component</a> example.
+ <p>This is the <a href="http://equanda.org">equanda </a> <a href="http://equanda.org/equanda-tapesty5/">tapestry5 component</a> example.
This part on the left demonstrates how the Accordion component can be used to create a full height accrdion with various information.</p>
<p>On the right part, there is a Tabs component in action. One tab contains another Accordion component, one another tags compoennt. This is done to demonstrate that you can put multiple objects on one page.</p>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-15 09:43:48
|
Revision: 978
http://equanda.svn.sourceforge.net/equanda/?rev=978&view=rev
Author: triathlon98
Date: 2009-01-15 09:43:38 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
don't log password to stdout
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/login/LoginModule.java.vm
Modified: trunk/equanda-generate/src/main/velocity/login/LoginModule.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/LoginModule.java.vm 2009-01-14 20:43:47 UTC (rev 977)
+++ trunk/equanda-generate/src/main/velocity/login/LoginModule.java.vm 2009-01-15 09:43:38 UTC (rev 978)
@@ -101,7 +101,6 @@
if ( null == pass ) return null;
info = cache.setUser( user, pass );
}
- System.out.println( "Password is " + info.getPassword() );
return info.getPassword();
}
catch ( EquandaException epe )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-14 20:43:52
|
Revision: 977
http://equanda.svn.sourceforge.net/equanda/?rev=977&view=rev
Author: triathlon98
Date: 2009-01-14 20:43:47 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2009-01-14 20:43:47 UTC (rev 977)
@@ -11,7 +11,7 @@
<t:unless test="hasValue()"><t:equanda.formactionlink t:id="Add" context="prop:setterId">${dollar}{equanda-message:Add}</t:equanda.formactionlink></t:unless>
</div>
<div class="eqInlRD">
- <t:if test="hasValue()"><t:${table.VarName}.Edit value="value" t:setterIdStart="selectIdStart" t:setterIdEnd="prop:setterIdEnd" t:showMetadata="prop:false" editmode="true" canSwitch="false"/></t:if>
+ <t:if test="hasValue()"><t:${table.VarName}.Edit value="value" t:setterIdStart="setterIdStart" t:setterIdEnd="prop:setterIdEnd" t:showMetadata="prop:false" editmode="true" canSwitch="false"/></t:if>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-14 19:55:52
|
Revision: 976
http://equanda.svn.sourceforge.net/equanda/?rev=976&view=rev
Author: triathlon98
Date: 2009-01-14 19:55:40 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
EQ-317 metadata should look like "display" (and cleanup some templates)
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm
Removed Paths:
-------------
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/boolean.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/choice.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linkone.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/password.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/string.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/text.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/tostring.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -25,24 +25,24 @@
<t:parameter name="title$pageindex">${dollar}{equanda-message:page.Metadata}</t:parameter>
<t:parameter name="content$pageindex">
<div class="eqFld ${table.Name}-md">
- <t:label for="id"/>
- <input t:type="TextField" t:label="equanda-message:field.EquandaId" t:id="id" t:value="value.Id" size="14" disabled="true" translate="prop:IdTranslator"/>
+ <label>${dollar}{equanda-message:field.EquandaId}</label>
+ ${dollar}{value.Id}
</div>
<div class="eqFld ${table.Name}-md">
- <t:label for="eqmdCD"/>
- <input t:type="TextField" t:label="equanda-message:field.EquandaCreationDate" t:id="eqmdCD" t:value="value.EquandaCreationDate" size="20" disabled="true" translate="prop:TimestampTranslator"/>
+ <label>${dollar}{equanda-message:field.EquandaCreationDate}</label>
+ <span t:type="ck/DateFormat" value="value.EquandaCreationDate" pattern="yyyy-MM-dd HH:mm:ss"/>
</div>
<div class="eqFld ${table.Name}-md">
- <t:label for="eqmdMD"/>
- <input t:type="TextField" t:label="equanda-message:field.EquandaModificationDate" t:id="eqmdMD" t:value="value.EquandaModificationDate" size="20" disabled="true" translate="prop:TimestampTranslator"/>
+ <label>${dollar}{equanda-message:field.EquandaModificationDate}</label>
+ <span t:type="ck/DateFormat" value="value.EquandaModificationDate" pattern="yyyy-MM-dd HH:mm:ss"/>
</div>
<div class="eqFld ${table.Name}-md">
- <t:label for="eqmdV"/>
- <input t:type="TextField" t:label="equanda-message:field.EquandaVersion" t:id="eqmdV" t:value="value.EquandaVersion" size="6" disabled="true"/>
+ <label>${dollar}{equanda-message:field.EquandaVersion}</label>
+ ${dollar}{value.EquandaVersion}
</div>
<div class="eqFld ${table.Name}-md">
- <t:label for="eqmdS"/>
- <input t:type="TextField" t:label="equanda-message:field.EquandaStatus" t:id="eqmdS" t:value="value.EquandaStatus" size="2" disabled="true"/>
+ <label>${dollar}{equanda-message:field.EquandaStatus}</label>
+ ${dollar}{value.EquandaStatus}
</div>
</t:parameter>
</span>
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/boolean.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/boolean.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/boolean.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,7 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-## multiple makes no sense
-${dollar}{value.${field.Name}}
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/choice.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/choice.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/choice.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,13 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-#if( $field.isMultiple() )
-## @ todo
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
-${dollar}{currentMultipleRow}
-</div>
-#else
-${dollar}{${field.Name}Translated}
-#end
\ No newline at end of file
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,12 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="ck/DateFormat" t:value="currentMultipleRow"/>
-</div>
-#else
-<span t:type="ck/DateFormat" t:value="value.${field.VarName}"/>
-#end
\ No newline at end of file
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linklist.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linklist.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,7 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-## @todo needs to be properly handled
-list of $table.Name objects
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linkone.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linkone.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/linkone.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,6 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<span t:type="${field.LinkTable.VarName}/Summary" t:value="value.${field.VarName}"/>
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/password.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/password.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/password.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,6 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-***
\ No newline at end of file
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/string.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/string.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/string.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,7 +0,0 @@
-#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
-<span t:type="equanda/Truncate" t:text="prop:currentMultipleRow"/>
-</div>
-#else
-<span t:type="equanda/Truncate" t:text="value.${field.VarName}"/>
-#end
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/text.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/text.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/text.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,12 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
-<span t:type="equanda/Truncate" t:text="prop:currentMultipleRow"/>
-</div>
-#else
-<span t:type="equanda/Truncate" t:text="value.${field.VarName}"/>
-#end
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,12 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="ck/DateFormat" t:value="currentMultipleRow" t:pattern="yyyy-MM-dd HH:mm:ss"/>
-</div>
-#else
-<span t:type="ck/DateFormat" t:value="value.${field.VarName}" t:pattern="yyyy-MM-dd HH:mm:ss"/>
-#end
\ No newline at end of file
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/tostring.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/tostring.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/tostring.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -1,12 +0,0 @@
-#* @vtlmacrolibrary path="../render.vm" *#
-#* @vtlvariable name="dollar" type="java.lang.String" *#
-#* @vtlvariable name="readOnlyContext" type="boolean" *#
-#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-#if( $field.isMultiple() )
-<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
-${dollar}{currentMultipleRow}
-</div>
-#else
-${dollar}{value.${field.VarName}}
-#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -3,5 +3,12 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-## @todo needs to be properly handled
-list of $table.Name objects
+<input t:type="TextField" t:value="literal:?" length="1" disabled="true" style="display:none"/>
+<div class="eqLL">
+
+ <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7">
+ <t:parameter name="empty"></t:parameter>
+ <div class="eqLLRD"><t:${field.LinkTable.VarName}.SummaryEditLink object="currentMultipleRow"/></div>
+ </div>
+
+</div>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-14 19:55:40 UTC (rev 976)
@@ -42,18 +42,18 @@
view.renderer.url=view-tml/url.tml.vm
view.renderer.email=view-tml/email.tml.vm
-list.type.string=list-tml/string.tml.vm
-list.type.clob=list-tml/string.tml.vm
-list.type.double=list-tml/tostring.tml.vm
-list.type.int=list-tml/tostring.tml.vm
-list.type.date=list-tml/date.tml.vm
-list.type.timestamp=list-tml/timestamp.tml.vm
-list.type.boolean=list-tml/boolean.tml.vm
-list.type.link.one=list-tml/linkone.tml.vm
-list.type.link.list=list-tml/linklist.tml.vm
-list.type.choice=list-tml/choice.tml.vm
+list.type.string=view-tml/string.tml.vm
+list.type.clob=view-tml/string.tml.vm
+list.type.double=view-tml/tostring.tml.vm
+list.type.int=view-tml/tostring.tml.vm
+list.type.date=view-tml/date.tml.vm
+list.type.timestamp=view-tml/timestamp.tml.vm
+list.type.boolean=view-tml/boolean.tml.vm
+list.type.link.one=view-tml/linkone.tml.vm
+list.type.link.list=view-tml/linklist.tml.vm
+list.type.choice=view-tml/choice.tml.vm
-list.field.EquandaUser.Password=list-tml/password.tml.vm
+list.field.EquandaUser.Password=view-tml/password.tml.vm
list.field.EquandaType=list-tml/type.tml.vm
list.renderer.text=list-tml/string.tml.vm
@@ -61,18 +61,18 @@
list.renderer.url=list-tml/string.tml.vm
list.renderer.email=list-tml/string.tml.vm
-summary.type.string=list-tml/string.tml.vm
-summary.type.clob=list-tml/text.tml.vm
-summary.type.double=list-tml/tostring.tml.vm
-summary.type.int=list-tml/tostring.tml.vm
-summary.type.date=list-tml/date.tml.vm
-summary.type.timestamp=list-tml/timestamp.tml.vm
-summary.type.boolean=list-tml/tostring.tml.vm
+summary.type.string=view-tml/string.tml.vm
+summary.type.clob=view-tml/string.tml.vm
+summary.type.double=view-tml/tostring.tml.vm
+summary.type.int=view-tml/tostring.tml.vm
+summary.type.date=view-tml/date.tml.vm
+summary.type.timestamp=view-tml/timestamp.tml.vm
+summary.type.boolean=view-tml/tostring.tml.vm
summary.type.link.one=summary-tml/linkone.tml.vm
summary.type.link.list=summary-tml/linklist.tml.vm
-summary.type.choice=list-tml/choice.tml.vm
+summary.type.choice=view-tml/choice.tml.vm
-summary.field.EquandaUser.Password=list-tml/password.tml.vm
+summary.field.EquandaUser.Password=view-tml/password.tml.vm
summary.field.EquandaType=list-tml/type.tml.vm
summary.renderer.text=list-tml/string.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/choice.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -3,7 +3,6 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="TextField" t:value="literal:?" length="1" disabled="true" style="display:none"/>
#if( $field.isMultiple() )
<!-- @ todo -->
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -5,8 +5,8 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="ck/DateFormat" t:value="currentMultipleRow"/>
+ <span t:type="ck/DateFormat" value="currentMultipleRow" pattern="dd.MM.yyyy"/>
</div>
#else
-<span t:type="ck/DateFormat" t:value="value.${field.VarName}"/>
+<span t:type="ck/DateFormat" value="value.${field.VarName}" pattern="dd.MM.yyyy"/>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -5,8 +5,8 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="ck/DateFormat" t:value="currentMultipleRow" t:pattern="yyyy-MM-dd HH:mm:ss"/>
+ <span t:type="ck/DateFormat" value="currentMultipleRow" pattern="dd.MM.yyyy HH:mm:ss"/>
</div>
#else
-<span t:type="ck/DateFormat" t:value="value.${field.VarName}" t:pattern="yyyy-MM-dd HH:mm:ss"/>
+<span t:type="ck/DateFormat" value="value.${field.VarName}" pattern="dd.MM.yyyy HH:mm:ss"/>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm 2009-01-14 11:03:32 UTC (rev 975)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/tostring.tml.vm 2009-01-14 19:55:40 UTC (rev 976)
@@ -3,7 +3,6 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="TextField" t:value="literal:?" length="1" disabled="true" style="display:none"/>
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
${dollar}{currentMultipleRow}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-14 11:03:38
|
Revision: 975
http://equanda.svn.sourceforge.net/equanda/?rev=975&view=rev
Author: triathlon98
Date: 2009-01-14 11:03:32 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
better translation
Modified Paths:
--------------
trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
Modified: trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
===================================================================
--- trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2009-01-14 10:07:14 UTC (rev 974)
+++ trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2009-01-14 11:03:32 UTC (rev 975)
@@ -536,7 +536,7 @@
.label.fr Sauvegarder
.key Select/equanda-fixed
.label.en Select
-.label.nl Kies
+.label.nl Selecteer
.label.ro Selecteaza
.label.fr Sélecter
.key SelectAll/equanda-fixed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-14 10:07:26
|
Revision: 974
http://equanda.svn.sourceforge.net/equanda/?rev=974&view=rev
Author: triathlon98
Date: 2009-01-14 10:07:14 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
fixes in state handling, loops are no longer volatile and EquandaSetterCache is not cleared s it is not known when this is possible
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -168,7 +168,7 @@
{
SelectedSettingsForSelect<T> settings = (SelectedSettingsForSelect<T>)selectedSettings;
selectedSettings = (SelectedSettings<T>) cache.get( settings.getSetterId() );
- cache.clear();
+ if ( null == selectedSettings ) log.error( "Could not find setter for " + settings.getSetterId() );
}
if ( selectedSettings.getSelectedList() != null )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -133,7 +133,7 @@
final Object onActionFromSelectRows()
{
- SelectedSettings ss = checkSelectedSettings( true );
+ SelectedSettings ss = checkSelectedSettings();
if ( selectedRows != null && !selectedRows.isEmpty() )
{
for ( Uoid row : selectedRows )
@@ -221,14 +221,13 @@
public abstract T getObject( Uoid uoid );
- public final SelectedSettings checkSelectedSettings( boolean clear )
+ public final SelectedSettings checkSelectedSettings()
{
SelectedSettings res = selectedSettings;
if ( selectedSettings instanceof SelectedSettingsForSelect )
{
SelectedSettingsForSelect<T> settings = (SelectedSettingsForSelect<T>)selectedSettings;
res = (SelectedSettings<T>) cache.get( settings.getSetterId() );
- if ( clear) cache.clear();
}
return res;
}
@@ -236,7 +235,7 @@
final Object onActionFromSelectOne( Uoid uoid )
{
resources.discardPersistentFieldChanges();
- SelectedSetter<T> setter = checkSelectedSettings( true ).getSelectedSetter();
+ SelectedSetter<T> setter = checkSelectedSettings().getSelectedSetter();
setter.setSelected( getObject( uoid ) );
return selectedSettings.getSelectedReturnPage();
}
@@ -244,25 +243,25 @@
final Object onActionFromSelectList( Uoid uoid )
{
resources.discardPersistentFieldChanges();
- checkSelectedSettings( true ).getSelectedList().add( getObject( uoid ) );
+ checkSelectedSettings().getSelectedList().add( getObject( uoid ) );
return selectedSettings.getSelectedReturnPage();
}
public boolean isForSelect()
{
- SelectedSettings ss = checkSelectedSettings( false );
+ SelectedSettings ss = checkSelectedSettings();
return ss != null && ( ss.getSelectedList() != null || ss.getSelectedSetter() != null );
}
public boolean isForSelectOne()
{
- SelectedSettings ss = checkSelectedSettings( false );
+ SelectedSettings ss = checkSelectedSettings();
return ss != null && ss.getSelectedSetter() != null;
}
public boolean isForSelectList()
{
- SelectedSettings ss = checkSelectedSettings( false );
+ SelectedSettings ss = checkSelectedSettings();
return ss != null && ss.getSelectedList() != null;
}
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -6,7 +6,7 @@
<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
- <div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:if test="isCanAdd()">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -106,7 +106,6 @@
if ( res != null )
{
res.getSelectedSetter().setSelected( null );
- cache.clear();
}
else
{
@@ -141,7 +140,6 @@
if ( res != null )
{
res.getSelectedSetter().setSelected( value );
- cache.clear();
}
else
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -6,7 +6,7 @@
<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
- <div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -5,7 +5,7 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7" volatile="true">
+ <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
<div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="index" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:equanda.formactionlink></div>
<div class="eqLLRD"><t:${table.VarName}.SummaryEditLink object="current"/></div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -136,7 +136,6 @@
if ( res != null )
{
res.getSelectedSetter().setSelected( null );
- cache.clear();
}
else
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm 2009-01-13 21:12:28 UTC (rev 973)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/linklist.tml.vm 2009-01-14 10:07:14 UTC (rev 974)
@@ -6,7 +6,7 @@
<input t:type="TextField" t:value="literal:?" length="1" disabled="true" style="display:none"/>
<div class="eqLL">
- <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7" volatile="true">
+ <div class="eqLLR" t:type="equanda/JSPagedLoop" source="value.${field.VarName}" value="currentMultipleRow" index="currentMultipleIndex" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
<div class="eqLLRD"><t:${field.LinkTable.VarName}.SummaryEditLink object="currentMultipleRow"/></div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-13 21:12:39
|
Revision: 973
http://equanda.svn.sourceforge.net/equanda/?rev=973&view=rev
Author: triathlon98
Date: 2009-01-13 21:12:28 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
EQ-315 add on embedded multiple link should immediately create
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2009-01-13 21:12:28 UTC (rev 973)
@@ -3,4 +3,4 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="${field.LinkTable.VarName}/LinkList" t:value="value.${field.VarName}" setterIdStart="clientId" setterIdEnd="${field.Name}" #if( $field.hasLinkTypeCompare() )filter="${field.Name}Filter"#end />
+<input t:type="${field.LinkTable.VarName}/LinkList" t:value="value.${field.VarName}" setterIdStart="clientId" embedded="${field.isEmbedded()}" setterIdEnd="${field.Name}" #if( $field.hasLinkTypeCompare() )filter="${field.Name}Filter"#end />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-13 18:21:46
|
Revision: 972
http://equanda.svn.sourceforge.net/equanda/?rev=972&view=rev
Author: triathlon98
Date: 2009-01-13 18:21:28 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
EQ-307 move from t5-components to chenillekit
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml
trunk/pom.xml
trunk/src/site/wiki/templates/login.wiki
trunk/src/site/wiki/templates/t5gui.wiki
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -20,13 +20,13 @@
<input t:type="TextField" t:translate="prop:translator" t:value="current" t:disabled="prop:disabled" onkeyup="eqCC(this, ${clientCaseConversion});"/>
</t:if>
<t:if t:test="dateType">
- <input t:type="DateField" t:value="current" t:format="%d.%m.%Y" t:disabled="prop:disabled"/>
+ <input t:type="ck/DateTimeField" t:value="current" t:timePicker="false" t:datePattern="dd.MM.yyyy" t:disabled="prop:disabled" />
</t:if>
<t:if t:test="timestampType">
- <input t:type="t5components/DateTimeField" t:value="current" t:timePicker="true" t:datePattern="yyyy-MM-dd HH:mm:ss" t:disabled="prop:disabled"/>
+ <input t:type="ck/DateTimeField" t:value="current" t:timePicker="true" t:datePattern="dd.MM.yyyy HH:mm:ss" t:disabled="prop:disabled" />
</t:if>
#*<t:if t:test="textType">
- <textarea t:type="TextArea" t:translate="prop:translator" rows="5" cols="50" t:mixins="t5components/Resizable" t:value="current" t:disabled="prop:disabled" onkeyup="eqCC(this, ${clientCaseConversion});"/>
+ <textarea t:type="TextArea" t:translate="prop:translator" rows="5" cols="50" t:mixins="ck/Resizable" t:value="current" t:disabled="prop:disabled" onkeyup="eqCC(this, ${clientCaseConversion});"/>
</t:if>*#
<t:if t:test="passwordType">
<input t:type="PasswordField" t:translate="prop:translator" t:value="current" t:disabled="prop:disabled"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -6,5 +6,5 @@
#if( $field.isMultiple() )
<input t:type="InlinePrimitiveList" t:dateType="true" t:value="value.${field.VarName}" embedded="${field.isEmbedded()}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end/>
#else
-<input t:type="t5components/DateTimeField" t:value="value.${field.Name}" t:timePicker="false" t:datePattern="dd.MM.yyyy" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end/>
+<input t:type="ck/DateTimeField" t:value="value.${field.Name}" t:timePicker="false" t:datePattern="dd.MM.yyyy" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end/>
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -7,6 +7,6 @@
##<input t:type="InlinePrimitiveList" t:textType="true" t:translator="prop:stringTranslator" t:value="value.${field.Name}" embedded="${field.isEmbedded()}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.isCaseConversionClass() ) caseConversionClass="$field.caseConversion.className" #end #if( $field.isCaseConversionUpper() ) caseConversionUpper="true" #elseif( $field.isCaseConversionLower() ) caseConversionLower="true" #end/>
#else
<div class="in">
-<textarea t:type="TextArea" rows="5" cols="50" t:mixins="t5components/Resizable" t:value="value.${field.Name}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.hasCaseConversion() )onkeyup="eqCC(this, #if( $field.isCaseConversionUpper()) 2 #elseif( $field.isCaseConversionLower() ) 1 #else 0 #end);"#end/>
+<textarea t:type="TextArea" rows="5" cols="50" t:mixins="ck/Resizable" t:value="value.${field.Name}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.hasCaseConversion() )onkeyup="eqCC(this, #if( $field.isCaseConversionUpper()) 2 #elseif( $field.isCaseConversionLower() ) 1 #else 0 #end);"#end/>
</div>
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -6,5 +6,5 @@
#if( $field.isMultiple() )
<input t:type="InlinePrimitiveList" t:timestampType="true" t:value="value.${field.VarName}" embedded="${field.isEmbedded()}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end/>
#else
-<input t:type="t5components/DateTimeField" t:value="value.${field.Name}" t:timePicker="true" t:datePattern="dd.MM.yyyy HH:mm:ss" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end/>
+<input t:type="ck/DateTimeField" t:value="value.${field.Name}" t:timePicker="true" t:datePattern="dd.MM.yyyy HH:mm:ss" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end/>
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/date.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -5,8 +5,8 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="t5components/DateFormat" t:value="currentMultipleRow"/>
+ <span t:type="ck/DateFormat" t:value="currentMultipleRow"/>
</div>
#else
-<span t:type="t5components/DateFormat" t:value="value.${field.VarName}"/>
+<span t:type="ck/DateFormat" t:value="value.${field.VarName}"/>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/list-tml/timestamp.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -5,8 +5,8 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="t5components/DateFormat" t:value="currentMultipleRow" t:pattern="yyyy-MM-dd HH:mm:ss"/>
+ <span t:type="ck/DateFormat" t:value="currentMultipleRow" t:pattern="yyyy-MM-dd HH:mm:ss"/>
</div>
#else
-<span t:type="t5components/DateFormat" t:value="value.${field.VarName}" t:pattern="yyyy-MM-dd HH:mm:ss"/>
+<span t:type="ck/DateFormat" t:value="value.${field.VarName}" t:pattern="yyyy-MM-dd HH:mm:ss"/>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -39,9 +39,9 @@
#elseif( ${par.Field.isBoolean()} )
<input t:type="CheckBox" t:value="value.${par.Name}" />
#elseif( ${par.Field.isDate()} )
-<input t:type="DateField" t:value="value.${par.Name}" t:format="dd.MM.yyyy" />
+<input t:type="ck/DateTimeField" t:value="value.${par.Name}" t:timePicker="false" t:datePattern="dd.MM.yyyy" />
#elseif( ${par.Field.isTimestamp()} )
-<input t:type="t5components/DateTimeField" t:value="value.${par.Name}" t:timePicker="true" t:datePattern="dd.MM.yyyy HH:mm:ss" />
+<input t:type="ck/DateTimeField" t:value="value.${par.Name}" t:timePicker="true" t:datePattern="dd.MM.yyyy HH:mm:ss" />
#elseif( ${par.Field.hasChoice()} )
<select t:type="Select" t:model="${par.field.Name}ChoiceModel" t:value="value.${par.field.Name}" t:validate="required" />
#else
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/date.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -5,8 +5,8 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="t5components/DateFormat" t:value="currentMultipleRow"/>
+ <span t:type="ck/DateFormat" t:value="currentMultipleRow"/>
</div>
#else
-<span t:type="t5components/DateFormat" t:value="value.${field.VarName}"/>
+<span t:type="ck/DateFormat" t:value="value.${field.VarName}"/>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/text.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -8,5 +8,5 @@
<span t:type="equanda/Truncate" t:text="value.${field.VarName}"/>
</div>
#else
-<textarea t:type="TextArea" t:mixins="t5components/Resizable" t:value="value.${field.Name}" disabled="true"/>
+<textarea t:type="TextArea" t:mixins="ck/Resizable" t:value="value.${field.Name}" disabled="true"/>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/timestamp.tml.vm 2009-01-13 18:21:28 UTC (rev 972)
@@ -5,8 +5,8 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( $field.isMultiple() )
<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
- <span t:type="t5components/DateFormat" t:value="currentMultipleRow" t:pattern="yyyy-MM-dd HH:mm:ss"/>
+ <span t:type="ck/DateFormat" t:value="currentMultipleRow" t:pattern="yyyy-MM-dd HH:mm:ss"/>
</div>
#else
-<span t:type="t5components/DateFormat" t:value="value.${field.VarName}" t:pattern="yyyy-MM-dd HH:mm:ss"/>
+<span t:type="ck/DateFormat" t:value="value.${field.VarName}" t:pattern="yyyy-MM-dd HH:mm:ss"/>
#end
\ No newline at end of file
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-01-13 18:21:28 UTC (rev 972)
@@ -91,8 +91,8 @@
<artifactId>equanda-t5gui</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
+ <groupId>org.chenillekit</groupId>
+ <artifactId>chenillekit-tapestry</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-01-13 18:21:28 UTC (rev 972)
@@ -390,9 +390,9 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
- <version>#literal()${t5compo-version}#end</version>
+ <groupId>org.chenillekit</groupId>
+ <artifactId>chenillekit-tapestry</artifactId>
+ <version>#literal()${chenillekit-version}#end</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -410,9 +410,8 @@
</repository>
<repository>
- <id>t5components</id>
- <name>T5Components Maven Repository</name>
- <url>http://87.193.218.134:8080/t5components/maven-repository</url>
+ <id>chenillekit</id>
+ <url>http://www.chenillekit.org/mvnrepo/release</url>
</repository>
</repositories>
@@ -475,8 +474,8 @@
<properties>
<equanda-version>0.9.1</equanda-version>
<staticwiki-version>0.9</staticwiki-version>
- <tapestry-version>5.0.15</tapestry-version>
- <t5compo-version>0.5.15</t5compo-version>
+ <tapestry-version>5.0.18</tapestry-version>
+ <chenillekit-version>1.0.0</chenillekit-version>
</properties>
</project>
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-tapestry5/pom.xml 2009-01-13 18:21:28 UTC (rev 972)
@@ -37,8 +37,8 @@
<artifactId>tapestry-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
+ <groupId>org.chenillekit</groupId>
+ <artifactId>chenillekit-tapestry</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2009-01-13 18:21:28 UTC (rev 972)
@@ -24,7 +24,6 @@
package org.equanda.tapestry5.components;
-import org.apache.tapestry.commons.components.Hidden;
import org.apache.tapestry5.*;
import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.components.Delegate;
@@ -34,6 +33,7 @@
import org.apache.tapestry5.services.Environment;
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.Request;
+import org.chenillekit.tapestry.core.components.Hidden;
import org.equanda.tapestry5.base.ObjectCreatorDelegate;
import org.equanda.tapestry5.base.PagerConfig;
import org.slf4j.Logger;
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml 2009-01-13 18:21:28 UTC (rev 972)
@@ -6,8 +6,8 @@
</div>
</t:loop>
- <input t:type="t5components/Hidden" t:id="CurrentPageHidden" />
- <input t:type="t5components/Hidden" t:id="AddedRowsHidden" />
+ <input t:type="ck/Hidden" t:id="CurrentPageHidden" />
+ <input t:type="ck/Hidden" t:id="AddedRowsHidden" />
<div t:id="pagerBottom" />
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/pom.xml 2009-01-13 18:21:28 UTC (rev 972)
@@ -343,10 +343,10 @@
<artifactId>tapestry-core</artifactId>
<version>${tapestry-release-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
- <version>${tapestry-commons-version}</version>
+ <dependency>
+ <groupId>org.chenillekit</groupId>
+ <artifactId>chenillekit-tapestry</artifactId>
+ <version>${chenillekit-version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -514,15 +514,16 @@
<id>OpenQA</id>
<url>http://maven.openqa.org</url>
</repository>
+ <!--
<repository>
<id>tapestry-snapshots</id>
<url>http://tapestry.formos.com/maven-snapshot-repository/</url>
</repository>
+ -->
<repository>
- <id>t5components</id>
- <name>T5Components Maven Repository</name>
- <url>http://87.193.218.134:8080/t5components/maven-repository</url>
- </repository>
+ <id>chenillekit</id>
+ <url>http://www.chenillekit.org/mvnrepo/release</url>
+ </repository>
</repositories>
<distributionManagement>
<repository>
@@ -600,8 +601,8 @@
</profiles>
<properties>
- <tapestry-release-version>5.0.17</tapestry-release-version>
- <tapestry-commons-version>0.5.15</tapestry-commons-version>
+ <tapestry-release-version>5.0.18</tapestry-release-version>
+ <chenillekit-version>1.0.0</chenillekit-version>
<staticwiki-release-version>0.9.1-SNAPSHOT</staticwiki-release-version>
</properties>
Modified: trunk/src/site/wiki/templates/login.wiki
===================================================================
--- trunk/src/site/wiki/templates/login.wiki 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/src/site/wiki/templates/login.wiki 2009-01-13 18:21:28 UTC (rev 972)
@@ -376,7 +376,7 @@
<body>
-<div t:type="t5components/RoundCornerContainer"
+<div t:type="ck/RoundCornerContainer"
fgcolor="#749572"
bgcolor="#FFFFFF"
style="padding: 40px;" >
@@ -464,7 +464,7 @@
<body>
-<div t:type="t5components/RoundCornerContainer"
+<div t:type="ck/RoundCornerContainer"
fgcolor="#749572"
bgcolor="#FFFFFF"
style="padding: 40px;" >
Modified: trunk/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/src/site/wiki/templates/t5gui.wiki 2009-01-13 18:13:05 UTC (rev 971)
+++ trunk/src/site/wiki/templates/t5gui.wiki 2009-01-13 18:21:28 UTC (rev 972)
@@ -31,9 +31,9 @@
<version>${tapestry-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
- <version>0.5.18</version>
+ <groupId>org.chenillekit</groupId>
+ <artifactId>chenillekit-tapestry</artifactId>
+ <version>1.0.0</version>
</dependency>
{code}
and following repositories
@@ -44,9 +44,8 @@
<url>http://maven.progs.be/m2repo</url>
</repository>
<repository>
- <id>t5components</id>
- <name>T5Components Maven Repository</name>
- <url>http://213.160.23.119:8080/t5components/maven-repository</url>
+ <id>chenillekit</id>
+ <url>http://www.chenillekit.org/mvnrepo/release</url>
</repository>
</repositories>
{code}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-13 18:13:11
|
Revision: 971
http://equanda.svn.sourceforge.net/equanda/?rev=971&view=rev
Author: triathlon98
Date: 2009-01-13 18:13:05 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
remove redundant output statements
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java 2009-01-13 14:09:24 UTC (rev 970)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java 2009-01-13 18:13:05 UTC (rev 971)
@@ -44,19 +44,16 @@
public void clear()
{
- System.out.println( "EquandaSetterCache ++++++++++++++ clear" );
persistentMap.clear();
}
public Object get( String key )
{
- System.out.println( "EquandaSetterCache +++++ get key " + key );
return persistentMap.get( key );
}
public void put( String key, Object value )
{
- System.out.println( "EquandaSetterCache +++++ put key " + key );
persistentMap.put( key, value );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-13 14:09:32
|
Revision: 970
http://equanda.svn.sourceforge.net/equanda/?rev=970&view=rev
Author: triathlon98
Date: 2009-01-13 14:09:24 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
fixes for IE
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/formtraversal.js
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js 2009-01-12 12:14:59 UTC (rev 969)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/equanda.js 2009-01-13 14:09:24 UTC (rev 970)
@@ -154,7 +154,8 @@
}
/**
- * Switch to edit mode in the edit component
+ * Switch to edit mode in the edit component.
+ * Different effects are used for IE vs rest of world to avoid problems.
* @param clientId
* @param page
*/
@@ -162,14 +163,21 @@
{
$( clientId + 'te' + page ).style.display = 'none';
$( clientId + 'ts' + page ).style.display = 'block';
- Effect.SlideUp( $( clientId + 'show' + page ) );
+ if ( Prototype.Browser.IE ) Effect.Fade( $( clientId + 'show' + page ) );
+ else Effect.SlideUp( $( clientId + 'show' + page ) );
var ffname = clientId + 'edit' + page;
if ( !$T( ffname ).formFragment ) new Tapestry.FormFragment( ffname );
+ if ( Prototype.Browser.IE )
+ {
+ $T( ffname ).formFragment.showFunc = Tapestry.ElementEffect.show;
+ $T( ffname ).formFragment.hideFunc = Tapestry.ElementEffect.fade;
+ }
$T( ffname ).formFragment.setVisible( true );
}
/**
- * Switch to show/display mode in the edit component
+ * Switch to show/display mode in the edit component.
+ * Different effects are used for IE vs rest of world to avoid problems.
* @param clientId
* @param page
*/
@@ -179,7 +187,14 @@
$( clientId + 'ts' + page ).style.display = 'none';
var ffname = clientId + 'edit' + page;
if ( !$T( ffname ).formFragment ) new Tapestry.FormFragment( ffname );
+ if ( Prototype.Browser.IE )
+ {
+ $T( ffname ).formFragment.showFunc = Tapestry.ElementEffect.show;
+ $T( ffname ).formFragment.hideFunc = Tapestry.ElementEffect.fade;
+ }
$T( ffname ).formFragment.setVisible( false );
- Effect.SlideDown( $( clientId + 'show' + page ) );
+ if ( Prototype.Browser.IE ) Effect.Appear( $( clientId + 'show' + page ) );//$( clientId + 'show' + page ).style.display = 'block';
+ else Effect.SlideDown( $( clientId + 'show' + page ) );
}
+
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/formtraversal.js
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/formtraversal.js 2009-01-12 12:14:59 UTC (rev 969)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/formtraversal.js 2009-01-13 14:09:24 UTC (rev 970)
@@ -20,8 +20,8 @@
tbody=tr.parentNode;
if ((td.style.display!="none") && (td.className!="displayNone") && (tr.style.display!="none") && (tr.className!="displayNone") && (tbody.style.display!="none") && (tbody.className!="displayNone"))
{
- elem.focus();
if (elem.tagName=="INPUT") elem.select();
+ else elem.focus();
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-12 12:17:14
|
Revision: 969
http://equanda.svn.sourceforge.net/equanda/?rev=969&view=rev
Author: triathlon98
Date: 2009-01-12 12:14:59 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
EQ-314 allow custom code to be included in Edit component
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/render.vm
trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
trunk/src/site/wiki/templates/t5gui.wiki
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.java.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-01-11 16:55:31 UTC (rev 968)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-01-12 12:14:59 UTC (rev 969)
@@ -283,4 +283,8 @@
#end
#end
+
+## include possibly needed extra code for the templates
+#parse( "t5gui/render.vm" )
+#render( "java.pages.${table.Name}" "java.pages" "" "" )
}
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.java.vm 2009-01-12 12:14:59 UTC (rev 969)
@@ -0,0 +1,15 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
+#if( !$field.isHidden() )
+#set( $renderfirst = "" )
+#set( $renderfirst = "$!field.RendererName" )
+#if( "x$renderfirst" != "x" )
+#render( "java.renderer.$renderfirst" "" "" "" )
+#else##no renderer
+#set( $renderfirst = "field.${table.Name}.${field.Name}" )
+#set( $specifictype = "${field.T5guiSpecificType}" )
+#set( $generictype = "${field.T5guiGenericType}" )
+#render( "java.$renderfirst" "java.field.${field.Name}" "java.$specifictype" "java.$generictype" )
+#end##check renderer
+#end
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.java.vm 2009-01-12 12:14:59 UTC (rev 969)
@@ -0,0 +1,11 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#* @vtlvariable name="group" type="org.equanda.domain.xml.Group" *#
+#if( !$group.isHidden() )
+#foreach( $field in $group.Fields )
+#render( "java.field" "" "" "" )
+#end
+#foreach( $group in $group.Groups )
+#render( "java.group.${table.Name}.${group.Name}" "java.group" "" "" )
+#end
+#end##!group.isHidden
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.java.vm 2009-01-12 12:14:59 UTC (rev 969)
@@ -0,0 +1,11 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#* @vtlvariable name="page" type="org.equanda.domain.xml.Page" *#
+#if( !$page.isHidden() )
+#foreach( $field in $page.Fields)
+#render( "java.field" "" "" "" )
+#end
+#foreach( $group in $page.Groups)
+#render( "java.group.${table.Name}.${group.Name}" "java.group" "" "" )
+#end
+#end##isHidden
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.java.vm 2009-01-12 12:14:59 UTC (rev 969)
@@ -0,0 +1,6 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+## page contents
+#foreach( $page in $table.Pages )
+#render( "java.page.${table.Name}.${page.Name}" "java.page" "" "" )
+#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/render.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/render.vm 2009-01-11 16:55:31 UTC (rev 968)
+++ trunk/equanda-generate/src/main/velocity/t5gui/render.vm 2009-01-12 12:14:59 UTC (rev 969)
@@ -16,7 +16,7 @@
#if( "x$file" != "x" )
#parse( "$file" )
#else
-"No renderer for object $key1 $key2 $key3 $key4"
+// "No renderer for object $key1 $key2 $key3 $key4"
#end##key4
#end##key3
#end##key2
Modified: trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-11 16:55:31 UTC (rev 968)
+++ trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-12 12:14:59 UTC (rev 969)
@@ -79,3 +79,8 @@
summary.renderer.wiki=list-tml/string.tml.vm
summary.renderer.url=list-tml/string.tml.vm
summary.renderer.email=list-tml/string.tml.vm
+
+java.pages=edit-tml/pages.java.vm
+java.page=edit-tml/page.java.vm
+java.group=edit-tml/group.java.vm
+java.field=edit-tml/field.java.vm
Modified: trunk/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/src/site/wiki/templates/t5gui.wiki 2009-01-11 16:55:31 UTC (rev 968)
+++ trunk/src/site/wiki/templates/t5gui.wiki 2009-01-12 12:14:59 UTC (rev 969)
@@ -132,6 +132,8 @@
edit.renderer.text=edit-tml/text.tml.vm
edit.renderer.wiki=edit-tml/text.tml.vm
+edit.renderer.url=edit-tml/string.tml.vm
+edit.renderer.email=edit-tml/string.tml.vm
view.type.string=view-tml/string.tml.vm
view.type.clob=view-tml/text.tml.vm
@@ -149,6 +151,8 @@
view.renderer.text=view-tml/text.tml.vm
view.renderer.wiki=view-tml/text.tml.vm
+view.renderer.url=view-tml/url.tml.vm
+view.renderer.email=view-tml/email.tml.vm
list.type.string=list-tml/string.tml.vm
list.type.clob=list-tml/string.tml.vm
@@ -166,6 +170,8 @@
list.renderer.text=list-tml/string.tml.vm
list.renderer.wiki=list-tml/string.tml.vm
+list.renderer.url=list-tml/string.tml.vm
+list.renderer.email=list-tml/string.tml.vm
summary.type.string=list-tml/string.tml.vm
summary.type.clob=list-tml/text.tml.vm
@@ -183,6 +189,13 @@
summary.renderer.text=list-tml/string.tml.vm
summary.renderer.wiki=list-tml/string.tml.vm
+summary.renderer.url=list-tml/string.tml.vm
+summary.renderer.email=list-tml/string.tml.vm
+
+java.pages=edit-tml/pages.java.vm
+java.page=edit-tml/page.java.vm
+java.group=edit-tml/group.java.vm
+java.field=edit-tml/field.java.vm
{code}
You can define the templates (and thus tapestry objects) which are used for the display based on the structure.
@@ -208,6 +221,8 @@
- pages.TableName : allow overwriting the generation of all pages (allow changing the use of the MemTabs component for a specific page).
- page.TableName.PageName : allow overwriting a specific page in a table. When combined with the default pages template, content should be inside a "t:parameter" for the parent component (by default MemTabs)
+The generated "Edit" components also allows custom java code to be injectd. For this the temapltes with keys starting with "java." are used. The default templates don't need any specific additions, so there is no code for these. However, all is in place for additions in custom templates.
+
*Important*
When customizing the templates which are used, you have to do a clean build ("mvn clean install") in your project to assure the modified templates are applied. As the templates are read from the classpath, the system is unable to know the timestamp for the templates and thus does not know when to overwrite the generated files if the domain model has not changed.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-11 16:55:43
|
Revision: 968
http://equanda.svn.sourceforge.net/equanda/?rev=968&view=rev
Author: triathlon98
Date: 2009-01-11 16:55:31 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
EQ-312 rework EquandaSetterCache handling, fixing some problems on the way
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinkone.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCache.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java
trunk/pom.xml
Removed Paths:
-------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/IdIndexKey.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -167,7 +167,7 @@
if ( selectedSettings instanceof SelectedSettingsForSelect )
{
SelectedSettingsForSelect<T> settings = (SelectedSettingsForSelect<T>)selectedSettings;
- selectedSettings = (SelectedSettings<T>) cache.get( new IdIndexKey( settings.getComponentId(), settings.getIndex() ) );
+ selectedSettings = (SelectedSettings<T>) cache.get( settings.getSetterId() );
cache.clear();
}
if ( selectedSettings.getSelectedList() != null )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -48,7 +48,6 @@
import org.equanda.t5gui.SelectedSettingsForSelect;
import org.equanda.t5gui.services.EquandaSetterCache;
import org.equanda.tapestry5.components.FormSupport;
-import org.equanda.t5gui.IdIndexKey;
import org.slf4j.Logger;
import java.util.*;
@@ -228,7 +227,7 @@
if ( selectedSettings instanceof SelectedSettingsForSelect )
{
SelectedSettingsForSelect<T> settings = (SelectedSettingsForSelect<T>)selectedSettings;
- res = (SelectedSettings<T>) cache.get( new IdIndexKey( settings.getComponentId(), settings.getIndex() ) );
+ res = (SelectedSettings<T>) cache.get( settings.getSetterId() );
if ( clear) cache.clear();
}
return res;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -53,7 +53,6 @@
import org.equanda.t5gui.services.EquandaMessages;
import org.equanda.tapestry5.base.EquandaOptionModel;
import org.equanda.tapestry5.base.EquandaSelectModel;
-import org.equanda.t5gui.IdIndexKey;
import org.equanda.t5gui.SelectedSettings;
import org.equanda.tapestry5.translators.TimestampTranslator;
import org.equanda.validation.*;
@@ -84,12 +83,16 @@
@Parameter( value = "prop:true" )
private boolean showMetadata;
+ @Property
@Parameter( defaultPrefix = BindingConstants.PROP )
- private Integer editIndex;
+ private String setterIdStart;
+ @Property
@Parameter( defaultPrefix = BindingConstants.LITERAL )
- private String selectComponentId;
+ private String setterIdEnd;
+ private String setterId;
+
@Inject
private ComponentResources resources;
@@ -148,26 +151,6 @@
public String getClientId() { return clientId; }
- public Integer getEditIndex()
- {
- return editIndex;
- }
-
- public void setEditIndex( Integer value )
- {
- this.editIndex = value;
- }
-
- public String getSelectComponentId()
- {
- return selectComponentId;
- }
-
- public void setSelectComponentId( String selectComponentId )
- {
- this.selectComponentId = selectComponentId;
- }
-
public ${ejbPackage}.client.${table.Name} getValue() { return value; }
public void setValue( ${ejbPackage}.client.${table.Name} value ) { this.value = value; }
@@ -184,12 +167,15 @@
void beginRender()
{
clientId = renderSupport.allocateClientId( resources );
+ if ( null == setterIdStart ) setterIdStart = clientId;
+ setterId = setterIdStart;
+ if ( null != setterIdEnd ) setterId += "§" + setterIdEnd;
#foreach( $field in $table.LinkFields )
#if( !$field.isMultiple() )
- cache.put( new IdIndexKey( "${table.Name}.${field.Name}", editIndex ),
+ cache.put( setterId + "§${field.Name}",
new SelectedSettings<${ejbPackage}.client.$field.FieldTypeName>( null, null, get${field.Name}Setter() ) );
#else
- cache.put( new IdIndexKey( "${table.Name}.${field.Name}", editIndex ),
+ cache.put( setterId + "§${field.Name}",
new SelectedSettings<${ejbPackage}.client.$field.FieldTypeName>( null, get${field.Name}SetterList(), null ) );
#end
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -18,7 +18,7 @@
<a href="javascript:;" id="ea-${dollar}{clientId}-${dollar}{index}" onclick="eqRevDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ed-${dollar}{clientId}-${dollar}{index}' )" style="display: none;" title="${dollar}{equanda-message:UndoDelete}"><img src="${dollar}{asset:classpath:org/equanda/t5gui/undo_delete.gif}" alt="${dollar}{equanda-message:UndoDelete}" /></a>
</div>
<div class="eqInlRD er-${dollar}{clientId}-${dollar}{index}">
- <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" editIndex="index" selectComponentId="prop:clientId" editmode="true" canSwitch="false"/></t:if>
+ <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" setterIndexStart="clientId" setterIndexEnd="prop:index" editmode="true" canSwitch="false"/></t:if>
</div>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -48,6 +48,7 @@
import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.*;
+import javolution.lang.TextBuilder;
/**
* Component for a single link to this object
@@ -61,11 +62,13 @@
@Parameter
private SelectedSetter<${ejbPackage}.client.${table.Name}> setter;
+ @Property
@Parameter( defaultPrefix = BindingConstants.PROP )
- private Integer editIndex;
+ private String setterIdStart;
+ @Property
@Parameter( defaultPrefix = BindingConstants.LITERAL )
- private String selectComponentId;
+ private String setterIdEnd;
@Inject
private ComponentResources resources;
@@ -76,26 +79,6 @@
@Environmental
private ValidationTracker validationTracker;
- public Integer getEditIndex()
- {
- return editIndex;
- }
-
- public void setEditIndex( Integer value )
- {
- this.editIndex = value;
- }
-
- public String getSelectComponentId()
- {
- return selectComponentId;
- }
-
- public void setSelectComponentId( String selectComponentId )
- {
- this.selectComponentId = selectComponentId;
- }
-
public ${ejbPackage}.client.${table.Name} getValue()
{
return value;
@@ -106,21 +89,20 @@
this.value = value;
}
- public List<Object> getSelectParameters()
+ public String getSetterId()
{
- List<Object> res = new ArrayList<Object>();
- if ( editIndex != null && selectComponentId != null )
- {
- res.add( editIndex );
- res.add( selectComponentId );
- }
- return res;
+ if ( null == setterIdStart ) return null;
+ TextBuilder tb = TextBuilder.newInstance();
+ tb.append( setterIdStart );
+ tb.append( '§' );
+ tb.append( setterIdEnd );
+ return tb.toString();
}
- Object onActionFromDelete( Integer index, String componentId )
+ Object onActionFromDelete( String setterId )
{
SelectedSettings<${ejbPackage}.client.${table.Name}> res =
- (SelectedSettings<${ejbPackage}.client.${table.Name}>) cache.get( new IdIndexKey( componentId, index ) );
+ (SelectedSettings<${ejbPackage}.client.${table.Name}>) cache.get( setterId );
if ( res != null )
{
res.getSelectedSetter().setSelected( null );
@@ -151,11 +133,11 @@
}
}
- Object onActionFromAdd( Integer index, String componentId )
+ Object onActionFromAdd( String setterId )
{
create();
SelectedSettings<${ejbPackage}.client.${table.Name}> res =
- (SelectedSettings<${ejbPackage}.client.${table.Name}>) cache.get( new IdIndexKey( componentId, index ) );
+ (SelectedSettings<${ejbPackage}.client.${table.Name}>) cache.get( setterId );
if ( res != null )
{
res.getSelectedSetter().setSelected( value );
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -7,11 +7,11 @@
<div class="eqInlR">
<div class="eqInlRL">
- <t:equanda.formactionlink t:id="Delete" context="prop:selectParameters" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}"/></t:equanda.formactionlink>
- <t:unless test="hasValue()"><t:equanda.formactionlink t:id="Add" context="prop:selectParameters">${dollar}{equanda-message:Add}</t:equanda.formactionlink></t:unless>
+ <t:equanda.formactionlink t:id="Delete" context="prop:setterId" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}"/></t:equanda.formactionlink>
+ <t:unless test="hasValue()"><t:equanda.formactionlink t:id="Add" context="prop:setterId">${dollar}{equanda-message:Add}</t:equanda.formactionlink></t:unless>
</div>
<div class="eqInlRD">
- <t:if test="hasValue()"><t:${table.VarName}.Edit value="value" t:editIndex="prop:editIndex" t:selectComponentId="prop:selectComponentId" t:showMetadata="prop:false" editmode="true" canSwitch="false"/></t:if>
+ <t:if test="hasValue()"><t:${table.VarName}.Edit value="value" t:setterIdStart="selectIdStart" t:setterIdEnd="prop:setterIdEnd" t:showMetadata="prop:false" editmode="true" canSwitch="false"/></t:if>
</div>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -42,12 +42,14 @@
import org.apache.tapestry5.BindingConstants;
import org.apache.tapestry5.annotations.InjectPage;
import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.persistence.Uoid;
import java.util.List;
import java.util.ArrayList;
+import javolution.lang.TextBuilder;
/**
* Component for a multiple link to this object
@@ -73,35 +75,20 @@
@Inject
private ComponentResources resources;
+ @Property
private ${table.Name} current;
+
+ @Property
private int index;
+ @Property
@Parameter( defaultPrefix = BindingConstants.PROP )
- private Integer editIndex;
+ private String setterIdStart;
+ @Property
@Parameter( defaultPrefix = BindingConstants.LITERAL )
- private String selectComponentId;
+ private String setterIdEnd;
- public Integer getEditIndex()
- {
- return editIndex;
- }
-
- public void setEditIndex( Integer value )
- {
- this.editIndex = value;
- }
-
- public String getSelectComponentId()
- {
- return selectComponentId;
- }
-
- public void setSelectComponentId( String selectComponentId )
- {
- this.selectComponentId = selectComponentId;
- }
-
public List<${ejbPackage}.client.${table.Name}> getValue()
{
return value;
@@ -112,30 +99,10 @@
this.value = value;
}
- public ${ejbPackage}.client.${table.Name} getCurrent()
+ Object onActionFromAdd( String setterId )
{
- return current;
- }
-
- public void setCurrent( ${ejbPackage}.client.${table.Name} current )
- {
- this.current = current;
- }
-
- public int getIndex()
- {
- return index;
- }
-
- public void setIndex( int index )
- {
- this.index = index;
- }
-
- Object onActionFromAdd( Integer index, String componentId )
- {
return add( new SelectedSettingsForSelect<${table.Name}>(
- resources.createPageLink( resources.getPageName(), false ), filter, componentId, index ) );
+ resources.createPageLink( resources.getPageName(), false ), filter, setterId ) );
}
Object onActionFromAdd()
@@ -189,14 +156,13 @@
filter = value;
}
- public List<Object> getSelectParameters()
+ public String getSetterId()
{
- List<Object> res = new ArrayList<Object>();
- if ( editIndex != null && selectComponentId != null )
- {
- res.add( editIndex );
- res.add( selectComponentId );
- }
- return res;
+ if ( null == setterIdStart ) return null;
+ TextBuilder tb = TextBuilder.newInstance();
+ tb.append( setterIdStart );
+ tb.append( '§' );
+ tb.append( setterIdEnd );
+ return tb.toString();
}
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -10,6 +10,6 @@
<div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="index" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:equanda.formactionlink></div>
<div class="eqLLRD"><t:${table.VarName}.SummaryEditLink object="current"/></div>
</div>
- <t:equanda.formactionlink t:id="Add" context="prop:selectParameters">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
+ <t:equanda.formactionlink t:id="Add" context="prop:setterId">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</div>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -50,6 +50,7 @@
import org.apache.log4j.Logger;
import java.util.*;
+import javolution.lang.TextBuilder;
/**
* Component for a single link to this object
@@ -71,11 +72,13 @@
@InjectPage
private ${table.Name}EquandaAll select;
+ @Property
@Parameter( defaultPrefix = BindingConstants.PROP )
- private Integer editIndex;
+ private String setterIdStart;
+ @Property
@Parameter( defaultPrefix = BindingConstants.LITERAL )
- private String selectComponentId;
+ private String setterIdEnd;
@Inject
private ComponentResources resources;
@@ -83,26 +86,6 @@
@Inject
private EquandaSetterCache cache;
- public Integer getEditIndex()
- {
- return editIndex;
- }
-
- public void setEditIndex( Integer value )
- {
- this.editIndex = value;
- }
-
- public String getSelectComponentId()
- {
- return selectComponentId;
- }
-
- public void setSelectComponentId( String selectComponentId )
- {
- this.selectComponentId = selectComponentId;
- }
-
public String getFilter()
{
return filter;
@@ -123,21 +106,20 @@
this.value = value;
}
- public List<Object> getSelectParameters()
+ public String getSetterId()
{
- List<Object> res = new ArrayList<Object>();
- if ( editIndex != null && selectComponentId != null )
- {
- res.add( editIndex );
- res.add( selectComponentId );
- }
- return res;
+ if ( null == setterIdStart ) return null;
+ TextBuilder tb = TextBuilder.newInstance();
+ tb.append( setterIdStart );
+ tb.append( '§' );
+ tb.append( setterIdEnd );
+ return tb.toString();
}
- Object onActionFromSelect( Integer index, String componentId )
+ Object onActionFromSelect( String setterId )
{
select.setSelectedSettings( new SelectedSettingsForSelect<${table.Name}>(
- resources.createPageLink( resources.getPageName(), false ), filter, componentId, index ) );
+ resources.createPageLink( resources.getPageName(), false ), filter, setterId ) );
return select;
}
@@ -148,9 +130,9 @@
return select;
}
- Object onActionFromDelete( Integer index, String componentId )
+ Object onActionFromDelete( String setterId )
{
- SelectedSettings<${table.Name}> res = (SelectedSettings<${table.Name}>) cache.get( new IdIndexKey( componentId, index ) );
+ SelectedSettings<${table.Name}> res = (SelectedSettings<${table.Name}>) cache.get( setterId );
if ( res != null )
{
res.getSelectedSetter().setSelected( null );
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -5,14 +5,14 @@
<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<div class="eqLLR">
- <t:equanda.formactionlink t:id="Select" context="prop:selectParameters">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
+ <t:equanda.formactionlink t:id="Select" context="prop:setterId">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
#if( $table.FieldReference )
<div class="autocomplete"><input t:type="equanda/TextField" t:mixins="autocomplete" t:id="selectedValue" t:zone="prop:zoneId"/></div>
<t:block t:id="val">
#end
<t:if test="hasValue()">
<span class="eqLLRdv">
- <t:equanda.formactionlink t:id="Delete" context="prop:selectParameters" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}"/></t:equanda.formactionlink>
+ <t:equanda.formactionlink t:id="Delete" context="prop:setterId" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}"/></t:equanda.formactionlink>
<t:${table.VarName}.SummaryEditLink object="value"/>
</span>
</t:if>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinklist.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinklist.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -3,4 +3,4 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="${field.LinkTable.VarName}/InlineLinkList" t:value="value.${field.VarName}" embedded="${field.isEmbedded()}" editIndex="editIndex" selectComponentId="${table.Name}.${field.Name}"/>
+<input t:type="${field.LinkTable.VarName}/InlineLinkList" t:value="value.${field.VarName}" embedded="${field.isEmbedded()}" setterIdStart="clientId" setterIdEnd="${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinkone.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinkone.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/inlinelinkone.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -3,4 +3,4 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="${field.LinkTable.VarName}/InlineLinkOne" t:value="value.${field.VarName}" t:setter="${field.Name}Setter" editIndex="editIndex" selectComponentId="${table.Name}.${field.Name}"/>
+<input t:type="${field.LinkTable.VarName}/InlineLinkOne" t:value="value.${field.VarName}" t:setter="${field.Name}Setter" setterIdStart="clientId" setterIdEnd="${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -3,4 +3,4 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="${field.LinkTable.VarName}/LinkList" t:value="value.${field.VarName}" editIndex="editIndex" selectComponentId="${table.Name}.${field.Name}" #if( $field.hasLinkTypeCompare() )filter="${field.Name}Filter"#end />
+<input t:type="${field.LinkTable.VarName}/LinkList" t:value="value.${field.VarName}" setterIdStart="clientId" setterIdEnd="${field.Name}" #if( $field.hasLinkTypeCompare() )filter="${field.Name}Filter"#end />
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2009-01-11 16:55:31 UTC (rev 968)
@@ -3,4 +3,4 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<input t:type="${field.LinkTable.VarName}/LinkOne" t:value="value.${field.VarName}" t:setter="${field.Name}Setter" editIndex="editIndex" selectComponentId="${table.Name}.${field.Name}" #if( $field.hasLinkTypeCompare() )filter="${field.Name}Filter"#end />
+<input t:type="${field.LinkTable.VarName}/LinkOne" t:value="value.${field.VarName}" t:setter="${field.Name}Setter" setterIdStart="clientId" setterIdEnd="${field.Name}" #if( $field.hasLinkTypeCompare() )filter="${field.Name}Filter"#end />
Deleted: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/IdIndexKey.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/IdIndexKey.java 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/IdIndexKey.java 2009-01-11 16:55:31 UTC (rev 968)
@@ -1,125 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.t5gui;
-
-import java.io.Serializable;
-
-/**
- * Id index key
- *
- * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
- */
-public class IdIndexKey
- implements Serializable
-{
- private static final long serialVersionUID = -6840091840831233438L;
-
- private String componentId;
- private Integer index;
-
- public IdIndexKey( String componentName, Integer index )
- {
- this.componentId = componentName;
- this.index = index;
- }
-
- public String getComponentId()
- {
- return componentId;
- }
-
- public void setComponentId( String componentName )
- {
- this.componentId = componentName;
- }
-
- public Integer getIndex()
- {
- return index;
- }
-
- public void setIndex( Integer index )
- {
- this.index = index;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ( ( componentId == null ) ? 0 : componentId.hashCode() );
- result = prime * result + ( ( index == null ) ? 0 : index.hashCode() );
- return result;
- }
-
- @Override
- public boolean equals( Object obj )
- {
- if ( this == obj )
- {
- return true;
- }
- if ( obj == null )
- {
- return false;
- }
- if ( getClass() != obj.getClass() )
- {
- return false;
- }
- IdIndexKey other = (IdIndexKey) obj;
- if ( componentId == null )
- {
- if ( other.componentId != null )
- {
- return false;
- }
- }
- else if ( !componentId.equals( other.componentId ) )
- {
- return false;
- }
- if ( index == null )
- {
- if ( other.index != null )
- {
- return false;
- }
- }
- else if ( !index.equals( other.index ) )
- {
- return false;
- }
- return true;
- }
-
- @Override
- public String toString()
- {
- return String.format( "%s [componentId=%s, index=%s]", getClass().getName(), componentId, index );
- }
-
-}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/SelectedSettingsForSelect.java 2009-01-11 16:55:31 UTC (rev 968)
@@ -33,23 +33,16 @@
public class SelectedSettingsForSelect<T>
extends SelectedSettings<T>
{
- private Integer index;
- private String componentId;
+ private String setterId;
- public SelectedSettingsForSelect( Object returnPage, String filter, String componentId, Integer index )
+ public SelectedSettingsForSelect( Object returnPage, String filter, String setterId )
{
super( returnPage, null, null, filter );
- this.componentId = componentId;
- this.index = index;
+ this.setterId = setterId;
}
- public Integer getIndex()
+ public String getSetterId()
{
- return index;
+ return setterId;
}
-
- public String getComponentId()
- {
- return componentId;
- }
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCache.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCache.java 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCache.java 2009-01-11 16:55:31 UTC (rev 968)
@@ -24,8 +24,6 @@
package org.equanda.t5gui.services;
-import org.equanda.t5gui.IdIndexKey;
-
/**
* Setter cache to be able to retrieve setters inside a loop
*
@@ -33,9 +31,9 @@
*/
public interface EquandaSetterCache
{
- void put( IdIndexKey key, Object value );
+ void put( String key, Object value );
- Object get( IdIndexKey key );
+ Object get( String key );
void clear();
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaSetterCacheImpl.java 2009-01-11 16:55:31 UTC (rev 968)
@@ -24,8 +24,6 @@
package org.equanda.t5gui.services;
-import org.equanda.t5gui.IdIndexKey;
-
import java.util.HashMap;
import java.util.Map;
@@ -37,25 +35,28 @@
public class EquandaSetterCacheImpl
implements EquandaSetterCache
{
- private Map<IdIndexKey, Object> persistentMap;
+ private Map<String, Object> persistentMap;
public EquandaSetterCacheImpl()
{
- persistentMap = new HashMap<IdIndexKey, Object>();
+ persistentMap = new HashMap<String, Object>();
}
public void clear()
{
+ System.out.println( "EquandaSetterCache ++++++++++++++ clear" );
persistentMap.clear();
}
- public Object get( IdIndexKey key )
+ public Object get( String key )
{
+ System.out.println( "EquandaSetterCache +++++ get key " + key );
return persistentMap.get( key );
}
- public void put( IdIndexKey key, Object value )
+ public void put( String key, Object value )
{
+ System.out.println( "EquandaSetterCache +++++ put key " + key );
persistentMap.put( key, value );
}
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-09 11:03:44 UTC (rev 967)
+++ trunk/pom.xml 2009-01-11 16:55:31 UTC (rev 968)
@@ -130,6 +130,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
+ <encoding>utf8</encoding>
<source>1.5</source>
<target>1.5</target>
</configuration>
@@ -420,9 +421,14 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.GA</version>
+ <version>3.3.0.GA</version>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.1.0.GA</version>
+ </dependency>
+ <dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>3.0.1</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-09 11:03:48
|
Revision: 967
http://equanda.svn.sourceforge.net/equanda/?rev=967&view=rev
Author: triathlon98
Date: 2009-01-09 11:03:44 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
EQ-313 assure velocity always treats templates as UTF-8
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2009-01-09 08:36:31 UTC (rev 966)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2009-01-09 11:03:44 UTC (rev 967)
@@ -226,6 +226,7 @@
vars.put( "dbType", dbType );
// now build the classes using Velocity templates
+ Velocity.setProperty( "input.encoding", "UTF-8" );
Velocity.setProperty( "resource.loader", "equanda" );
Velocity.setProperty( "equanda.resource.loader.description", "equanda Resource Loader" );
Velocity.setProperty( "equanda.resource.loader.class", "org.equanda.generate.EquandaResourceLoader" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-09 08:36:37
|
Revision: 966
http://equanda.svn.sourceforge.net/equanda/?rev=966&view=rev
Author: triathlon98
Date: 2009-01-09 08:36:31 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
fix outdated plugin name
Modified Paths:
--------------
trunk/equanda-test/test-gui-t5-test/pom.xml
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-01-08 23:04:59 UTC (rev 965)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-01-09 08:36:31 UTC (rev 966)
@@ -15,8 +15,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-08 23:05:02
|
Revision: 965
http://equanda.svn.sourceforge.net/equanda/?rev=965&view=rev
Author: triathlon98
Date: 2009-01-08 23:04:59 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
fix when reference field is not called "Reference"
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-01-08 21:30:54 UTC (rev 964)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2009-01-08 23:04:59 UTC (rev 965)
@@ -181,7 +181,7 @@
{
try
{
- if ( null != value ) return value.getReference();
+ if ( null != value ) return value.get${table.FieldReference.Name}();
} catch ( EquandaException ee ) { log.error( ee ); }
return "";
}
@@ -195,12 +195,12 @@
List<String> matches = new ArrayList<String>();
try
{
- List<${table.Name}> list = ${table.Name}.selectEquandaReferenceStart( partial );
+ List<${table.Name}> list = ${table.Name}.selectEquanda${table.FieldReference.Name}Start( partial );
for( ${table.Name} ref : list )
{
- if( ref.getReference() != null || ref.getReference().length() != 0 )
- matches.add( ref.get${table.FieldReference.Name}() );
+ String val = ref.get${table.FieldReference.Name}();
+ if( val != null && val.length() > 0 ) matches.add( ref.get${table.FieldReference.Name}() );
}
}
catch ( EquandaException ee )
@@ -216,7 +216,7 @@
{
try
{
- List<${table.Name}> list = ${table.Name}.selectEquandaReferenceStart( ref );
+ List<${table.Name}> list = ${table.Name}.selectEquanda${table.FieldReference.Name}Start( ref );
${table.Name} val = null;
if ( list.size() > 0 ) val = list.get( 0 );
if ( val != null || " ".equals( ref ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-08 22:23:15
|
Revision: 964
http://equanda.svn.sourceforge.net/equanda/?rev=964&view=rev
Author: triathlon98
Date: 2009-01-08 21:30:54 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
EQ-311 email renderer (and proper equandaAttachment in infra)
Modified Paths:
--------------
trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml
trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/util/EquandaAttachment.table
trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
trunk/src/site/wiki/templates/t5gui.wiki
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm
Modified: trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml
===================================================================
--- trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml 2009-01-07 16:50:26 UTC (rev 963)
+++ trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml 2009-01-08 21:30:54 UTC (rev 964)
@@ -19,6 +19,6 @@
<!-- utility files -->
<!-- was for t4 gui, not yet replaced in t5
<table file="classpath://org/equanda/infrastructure/util/EquandaAlert.table"/>
+ -->
<table file="classpath://org/equanda/infrastructure/util/EquandaAttachment.table"/>
- -->
</equanda>
\ No newline at end of file
Modified: trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/util/EquandaAttachment.table
===================================================================
--- trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/util/EquandaAttachment.table 2009-01-07 16:50:26 UTC (rev 963)
+++ trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/util/EquandaAttachment.table 2009-01-08 21:30:54 UTC (rev 964)
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE table SYSTEM "equanda.dtd">
-<table name="EquandaAttachment" expected-amount="medium">
+<table name="EquandaAttachment" expected-amount="large">
+ <description>
+ Attachment files which can have any type.
+ </description>
<page>
- <field name="Name" type="string" length="60">
- <description>
- Name of the file attached.
- </description>
+ <field name="FileName" length="100">
+ <description>Original file name.</description>
+ <display/>
</field>
-
+ <field name="Description" type="clob" renderer="wiki">
+ <description>Description of the attachment.</description>
+ <display/>
+ </field>
<field name="Size" type="int">
<description>
Size of the attached file.
@@ -16,9 +21,8 @@
</field>
<field name="MimeType" type="string" length="50">
- <description>
- MimeType(ContextType) of the file attached.
- </description>
+ <description>Mime type for the object</description>
+ <display/>
</field>
<field name="Date" type="date">
@@ -28,10 +32,8 @@
<default>NOW</default>
</field>
- <field name="Data" type="blob">
- <description>
- Binary content of the attachment.
- </description>
+ <field name="Object" type="blob">
+ <description>Binary content of the attachment.</description>
</field>
</page>
<hide/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-07 16:50:26 UTC (rev 963)
+++ trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-08 21:30:54 UTC (rev 964)
@@ -21,6 +21,7 @@
edit.renderer.text=edit-tml/text.tml.vm
edit.renderer.wiki=edit-tml/text.tml.vm
edit.renderer.url=edit-tml/string.tml.vm
+edit.renderer.email=edit-tml/string.tml.vm
view.type.string=view-tml/string.tml.vm
view.type.clob=view-tml/text.tml.vm
@@ -39,6 +40,7 @@
view.renderer.text=view-tml/text.tml.vm
view.renderer.wiki=view-tml/text.tml.vm
view.renderer.url=view-tml/url.tml.vm
+view.renderer.email=view-tml/email.tml.vm
list.type.string=list-tml/string.tml.vm
list.type.clob=list-tml/string.tml.vm
@@ -57,6 +59,7 @@
list.renderer.text=list-tml/string.tml.vm
list.renderer.wiki=list-tml/string.tml.vm
list.renderer.url=list-tml/string.tml.vm
+list.renderer.email=list-tml/string.tml.vm
summary.type.string=list-tml/string.tml.vm
summary.type.clob=list-tml/text.tml.vm
@@ -75,3 +78,4 @@
summary.renderer.text=list-tml/string.tml.vm
summary.renderer.wiki=list-tml/string.tml.vm
summary.renderer.url=list-tml/string.tml.vm
+summary.renderer.email=list-tml/string.tml.vm
Added: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/email.tml.vm 2009-01-08 21:30:54 UTC (rev 964)
@@ -0,0 +1,12 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="dollar" type="java.lang.String" *#
+#* @vtlvariable name="readOnlyContext" type="boolean" *#
+#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
+#if( $field.isMultiple() )
+<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<a href="mailto:${dollar}{currentMultipleRow}">${dollar}{currentMultipleRow}</a>
+</div>
+#else
+<a href="mailto:${dollar}{value.${field.VarName}}">${dollar}{value.${field.VarName}}</a>
+#end
\ No newline at end of file
Modified: trunk/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/src/site/wiki/templates/t5gui.wiki 2009-01-07 16:50:26 UTC (rev 963)
+++ trunk/src/site/wiki/templates/t5gui.wiki 2009-01-08 21:30:54 UTC (rev 964)
@@ -87,6 +87,7 @@
There are two renderers which are provided by default which can be used :
- text : to assure a string can be input in a text box
- url : allows the user to link to the resource when in view mode
+- email : allows the user to click on the e-mail address to send an e-mail (when in view mode)
*TODO : documentation to be completed*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-07 16:50:36
|
Revision: 963
http://equanda.svn.sourceforge.net/equanda/?rev=963&view=rev
Author: triathlon98
Date: 2009-01-07 16:50:26 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
inline links should always be in edit mode, add "canAdd" to inlinelinklist component
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/src/site/wiki/templates/t5gui.wiki
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfigGroupVars.java.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm 2009-01-07 09:58:20 UTC (rev 962)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm 2009-01-07 16:50:26 UTC (rev 963)
@@ -91,6 +91,19 @@
private String hiddenDeletedRowsId;
private int index;
+ @Parameter( value = "prop:true", defaultPrefix = BindingConstants.PROP )
+ private boolean canAdd;
+
+ public boolean isCanAdd()
+ {
+ return canAdd;
+ }
+
+ public void setCanAdd( boolean canAdd )
+ {
+ this.canAdd = canAdd;
+ }
+
public Translator getStringTranslator() { return STRING_TRANSLATOR; }
static class FormSubmitAction
@@ -177,6 +190,7 @@
public int getAdditionalRowCount()
{
+ if ( !canAdd ) return 0;
String additionalRows = symbolSource.valueForSymbol( "equanda.inlinelinklist.additional.row.count" );
if ( additionalRows != null && additionalRows.trim().length() > 0 )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-07 09:58:20 UTC (rev 962)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-01-07 16:50:26 UTC (rev 963)
@@ -9,14 +9,16 @@
<div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
- <t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
+ <t:if test="isCanAdd()">
+ <t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
+ </t:if>
</t:parameter>
<div class="eqInlRL">
<a href="javascript:;" id="ed-${dollar}{clientId}-${dollar}{index}" onclick="eqMarkDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ea-${dollar}{clientId}-${dollar}{index}' )" title="${dollar}{equanda-message:Delete}"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" alt="${dollar}{equanda-message:Delete}" /></a>
<a href="javascript:;" id="ea-${dollar}{clientId}-${dollar}{index}" onclick="eqRevDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ed-${dollar}{clientId}-${dollar}{index}' )" style="display: none;" title="${dollar}{equanda-message:UndoDelete}"><img src="${dollar}{asset:classpath:org/equanda/t5gui/undo_delete.gif}" alt="${dollar}{equanda-message:UndoDelete}" /></a>
</div>
<div class="eqInlRD er-${dollar}{clientId}-${dollar}{index}">
- <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" editIndex="index" selectComponentId="prop:clientId"/></t:if>
+ <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" editIndex="index" selectComponentId="prop:clientId" editmode="true" canSwitch="false"/></t:if>
</div>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2009-01-07 09:58:20 UTC (rev 962)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2009-01-07 16:50:26 UTC (rev 963)
@@ -11,7 +11,7 @@
<t:unless test="hasValue()"><t:equanda.formactionlink t:id="Add" context="prop:selectParameters">${dollar}{equanda-message:Add}</t:equanda.formactionlink></t:unless>
</div>
<div class="eqInlRD">
- <t:if test="hasValue()"><t:${table.VarName}.Edit value="value" t:editIndex="prop:editIndex" t:selectComponentId="prop:selectComponentId" t:showMetadata="prop:false"/></t:if>
+ <t:if test="hasValue()"><t:${table.VarName}.Edit value="value" t:editIndex="prop:editIndex" t:selectComponentId="prop:selectComponentId" t:showMetadata="prop:false" editmode="true" canSwitch="false"/></t:if>
</div>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-01-07 09:58:20 UTC (rev 962)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-01-07 16:50:26 UTC (rev 963)
@@ -116,9 +116,11 @@
{
return getIsGuiAdmin() && (getRoleName() != null);
}
-
- ## RWLSP checkboxes for every page
+
#foreach( $page in $table.Pages )
+
+ ## RWLSP checkboxes for every page
+
#set ($readBox="${page.Name}_pageReadCheck")
#set ($writeBox="${page.Name}_pageWriteCheck")
#set ($listBox="${page.Name}_pageListCheck")
@@ -133,60 +135,31 @@
private boolean $writeBox;
public boolean get$writeBox(){ return $writeBox; }
public void set$writeBox( boolean val ){ this.$writeBox = val; }
-
+
@Persist
private boolean $listBox;
public boolean get$listBox(){ return $listBox; }
public void set$listBox( boolean val ){ this.$listBox = val; }
-
+
@Persist
private boolean $sumBox;
public boolean get$sumBox(){ return $sumBox; }
public void set$sumBox( boolean val ){ this.$sumBox = val; }
-
+
@Persist
private boolean $printBox;
public boolean get$printBox(){ return $printBox; }
public void set$printBox( boolean val ){ this.$printBox = val; }
-#end
-
-## RWLSP checkboxes for every group
-#foreach( $page in $table.Pages )
#foreach( $group in $page.Groups)
-#set ($readBox="${group.Name}_groupReadCheck")
-#set ($writeBox="${group.Name}_groupWriteCheck")
-#set ($listBox="${group.Name}_groupListCheck")
-#set ($sumBox="${group.Name}_groupSumCheck")
-#set ($printBox="${group.Name}_groupPrintCheck")
- @Persist
- private boolean $readBox;
- public boolean get$readBox(){ return $readBox; }
- public void set$readBox( boolean val ){ this.$readBox = val; }
- @Persist
- private boolean $writeBox;
- public boolean get$writeBox(){ return $writeBox; }
- public void set$writeBox( boolean val ){ this.$writeBox = val; }
-
- @Persist
- private boolean $listBox;
- public boolean get$listBox(){ return $listBox; }
- public void set$listBox( boolean val ){ this.$listBox = val; }
-
- @Persist
- private boolean $sumBox;
- public boolean get$sumBox(){ return $sumBox; }
- public void set$sumBox( boolean val ){ this.$sumBox = val; }
-
- @Persist
- private boolean $printBox;
- public boolean get$printBox(){ return $printBox; }
- public void set$printBox( boolean val ){ this.$printBox = val; }
+## RWLSP checkboxes for every group
+#parse( "pages/TableAuthConfigGroupVars.java.vm" )
-#end
-#end
+#end##forach group
+#end##foreach page
+
## RWLSP checkboxes for every field
#foreach( $field in $table.Fields)
#set ($readBox="${field.Name}_readCheck")
Added: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfigGroupVars.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfigGroupVars.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfigGroupVars.java.vm 2009-01-07 16:50:26 UTC (rev 963)
@@ -0,0 +1,36 @@
+#set ($readBox="${group.Name}_groupReadCheck")
+#set ($writeBox="${group.Name}_groupWriteCheck")
+#set ($listBox="${group.Name}_groupListCheck")
+#set ($sumBox="${group.Name}_groupSumCheck")
+#set ($printBox="${group.Name}_groupPrintCheck")
+ @Persist
+ private boolean $readBox;
+ public boolean get$readBox(){ return $readBox; }
+ public void set$readBox( boolean val ){ this.$readBox = val; }
+
+ @Persist
+ private boolean $writeBox;
+ public boolean get$writeBox(){ return $writeBox; }
+ public void set$writeBox( boolean val ){ this.$writeBox = val; }
+
+ @Persist
+ private boolean $listBox;
+ public boolean get$listBox(){ return $listBox; }
+ public void set$listBox( boolean val ){ this.$listBox = val; }
+
+ @Persist
+ private boolean $sumBox;
+ public boolean get$sumBox(){ return $sumBox; }
+ public void set$sumBox( boolean val ){ this.$sumBox = val; }
+
+ @Persist
+ private boolean $printBox;
+ public boolean get$printBox(){ return $printBox; }
+ public void set$printBox( boolean val ){ this.$printBox = val; }
+
+#foreach( $group in $group.Groups)
+
+## RWLSP checkboxes for every group
+#parse( "pages/TableAuthConfigGroupVars.java.vm" )
+
+#end##forach group
Modified: trunk/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/src/site/wiki/templates/t5gui.wiki 2009-01-07 09:58:20 UTC (rev 962)
+++ trunk/src/site/wiki/templates/t5gui.wiki 2009-01-07 16:50:26 UTC (rev 963)
@@ -56,8 +56,8 @@
h2. Generated components
For each (root) table the following components are generated.
-- Edit : allows editing and or showing an entire record, considering the configured authorization for the user. Two important parameters are "editMode" and "canSwitch". They both accept boolean values and indicate whether the component starts in edit or display mode and whether the user can switch between the two.
-- InlineLinkList : allows inline editing of the multiple records.
+- Edit : allows editing and or showing an entire record, considering the configured authorization for the user. Two important parameters are "editMode" and "canSwitch". They both accept boolean values and indicate whether the component starts in edit or display mode and whether the user can switch between the two. There is also a "showMetadata" parameter which allows you to disable the display of the metadata tab.
+- InlineLinkList : allows inline editing of the multiple records. The "canAdd" parameter allows you to determine whether adding records is allowed.
- InlineLinkOne : allows inline editing of the one record.
- LinkList : ...
- LinkOne : ...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-07 09:58:28
|
Revision: 962
http://equanda.svn.sourceforge.net/equanda/?rev=962&view=rev
Author: triathlon98
Date: 2009-01-07 09:58:20 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
assure link fields are not rendered when no rights to view the linked table
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2009-01-07 08:43:07 UTC (rev 961)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2009-01-07 09:58:20 UTC (rev 962)
@@ -5,6 +5,9 @@
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
#if( !$field.isHidden() )
<t:if test="equanda-readable:field.${table.Name}.${field.Name}">
+#if( $field.isLink() )
+<t:if test="equanda-readable:table.${field.LinkTableName}">
+#end
<div class="eqFld ${table.Name}-${field.Name} ${table.Name}-t-${field.TableType}">
<label#if( $field.isRequired() ) class="eqReq" #end>${dollar}{equanda-message:field.${table.Name}.${field.Name}}</label>
@@ -42,5 +45,8 @@
</t:if>
</div>
+#if( $field.isLink() )
</t:if>
+#end
+</t:if>
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-07 08:43:12
|
Revision: 961
http://equanda.svn.sourceforge.net/equanda/?rev=961&view=rev
Author: triathlon98
Date: 2009-01-07 08:43:07 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
EQ-310 add url renderer
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
trunk/src/site/wiki/templates/t5gui.wiki
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/templates.properties
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-06 17:57:11 UTC (rev 960)
+++ trunk/equanda-generate/src/main/velocity/t5gui/templates.properties 2009-01-07 08:43:07 UTC (rev 961)
@@ -20,6 +20,7 @@
edit.renderer.text=edit-tml/text.tml.vm
edit.renderer.wiki=edit-tml/text.tml.vm
+edit.renderer.url=edit-tml/string.tml.vm
view.type.string=view-tml/string.tml.vm
view.type.clob=view-tml/text.tml.vm
@@ -37,6 +38,7 @@
view.renderer.text=view-tml/text.tml.vm
view.renderer.wiki=view-tml/text.tml.vm
+view.renderer.url=view-tml/url.tml.vm
list.type.string=list-tml/string.tml.vm
list.type.clob=list-tml/string.tml.vm
@@ -54,6 +56,7 @@
list.renderer.text=list-tml/string.tml.vm
list.renderer.wiki=list-tml/string.tml.vm
+list.renderer.url=list-tml/string.tml.vm
summary.type.string=list-tml/string.tml.vm
summary.type.clob=list-tml/text.tml.vm
@@ -71,3 +74,4 @@
summary.renderer.text=list-tml/string.tml.vm
summary.renderer.wiki=list-tml/string.tml.vm
+summary.renderer.url=list-tml/string.tml.vm
Added: trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/view-tml/url.tml.vm 2009-01-07 08:43:07 UTC (rev 961)
@@ -0,0 +1,12 @@
+#* @vtlmacrolibrary path="../render.vm" *#
+#* @vtlvariable name="dollar" type="java.lang.String" *#
+#* @vtlvariable name="readOnlyContext" type="boolean" *#
+#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
+#if( $field.isMultiple() )
+<div t:type="Loop" t:source="value.${field.VarName}" t:value="currentMultipleRow" t:index="currentMultipleIndex">
+<a href="${dollar}{currentMultipleRow}" target="_blank">${dollar}{currentMultipleRow}</a>
+</div>
+#else
+<a href="${dollar}{value.${field.VarName}}" target="_blank">${dollar}{value.${field.VarName}}</a>
+#end
\ No newline at end of file
Modified: trunk/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/src/site/wiki/templates/t5gui.wiki 2009-01-06 17:57:11 UTC (rev 960)
+++ trunk/src/site/wiki/templates/t5gui.wiki 2009-01-07 08:43:07 UTC (rev 961)
@@ -83,6 +83,11 @@
h2. renderer support
In the domain model, it is possible to overwrite the rendering of specific fields or groups using the "renderer" parameter on the definition.
+
+There are two renderers which are provided by default which can be used :
+- text : to assure a string can be input in a text box
+- url : allows the user to link to the resource when in view mode
+
*TODO : documentation to be completed*
h2. configuring how forms are generated
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-01-06 17:57:18
|
Revision: 960
http://equanda.svn.sourceforge.net/equanda/?rev=960&view=rev
Author: triathlon98
Date: 2009-01-06 17:57:11 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
more AuthAndConfig fixes
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigCombined.java
trunk/equanda-server/src/test/java/org/equanda/auth/AuthAndConfigCombinedTest.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/AuthReadableFactory.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-01-06 13:24:00 UTC (rev 959)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-01-06 17:57:11 UTC (rev 960)
@@ -260,7 +260,7 @@
#set ($deleteBox="${table.Name}_deleteCheck")
set${readBox}( aacProvider.isReadable( "table.${table.Name}") );
set${writeBox}( aacProvider.isWritable( "table.${table.Name}") );
- set${deleteBox}( aacProvider.isDelete( "table.${table.Name}") );
+ set${deleteBox}( aacProvider.isDeletable( "table.${table.Name}") );
#end
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-01-06 13:24:00 UTC (rev 959)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-01-06 17:57:11 UTC (rev 960)
@@ -19,7 +19,7 @@
<ul>
#foreach( $sel in ${table.SelectsNotHidden} )
#if( $sel.Name != $select.Name )
- <t:if test="equanda-readable:select.${table.Name}.${select.Name}">
+ <t:if test="equanda-readable:select.${table.Name}.${sel.Name}">
<li><a t:type="actionlink" t:id="select${sel.Name}">${dollar}{equanda-message:select.${table.Name}.${sel.Name}}</a></li>
</t:if>
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-01-06 13:24:00 UTC (rev 959)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-01-06 17:57:11 UTC (rev 960)
@@ -262,9 +262,43 @@
#set ($listBox="${field.Name}_listCheck")
#set ($summaryBox="${field.Name}_sumCheck")
#set ($printBox="${field.Name}_printCheck")
- setAuths( "field.${table.Name}." + "${field.Name}", $readBox, $writeBox, $listBox, $summaryBox, $printBox );
+ setAuths( "field.${table.Name}.${field.Name}", $readBox, $writeBox, $listBox, $summaryBox, $printBox );
#end
+#foreach( $page in $table.Pages)
+#foreach( $field in $page.Fields)
+#set ($readBox="${field.Name}_readCheck")
+#set ($writeBox="${field.Name}_writeCheck")
+#set ($listBox="${field.Name}_listCheck")
+#set ($summaryBox="${field.Name}_sumCheck")
+#set ($printBox="${field.Name}_printCheck")
+ setAuths( "field.${table.Name}.${field.Name}", $readBox, $writeBox, $listBox, $summaryBox, $printBox );
+#set ($pageReadBox="${page.Name}_pageReadCheck")
+#set ($pageWriteBox="${page.Name}_pageWriteCheck")
+#set ($pageListBox="${page.Name}_pageListCheck")
+#set ($pageSumBox="${page.Name}_pageSumCheck")
+#set ($pagePrintBox="${page.Name}_pagePrintCheck")
+ setAuths( "page.${table.Name}.${page.Name}", $pageReadBox, $pageWriteBox, false, false, false );
+#end
+#foreach( $group in $page.Groups)
+#foreach( $field in $group.Fields)
+#set ($readBox="${field.Name}_readCheck")
+#set ($writeBox="${field.Name}_writeCheck")
+#set ($listBox="${field.Name}_listCheck")
+#set ($summaryBox="${field.Name}_sumCheck")
+#set ($printBox="${field.Name}_printCheck")
+ setAuths( "field.${table.Name}.${field.Name}", $readBox, $writeBox, $listBox, $summaryBox, $printBox );
+#set ($groupReadBox="${group.Name}_groupReadCheck")
+#set ($groupWriteBox="${group.Name}_groupWriteCheck")
+#set ($groupListBox="${group.Name}_groupListCheck")
+#set ($groupSumBox="${group.Name}_groupSumCheck")
+#set ($groupPrintBox="${group.Name}_groupPrintCheck")
+ setAuths( "group.${table.Name}.${group.Name}", $groupReadBox, $groupWriteBox, false, false, false );
+#end
+#end
+#end
+
+
#foreach( $select in $table.SelectsNotHidden)
#set ($selectBox="${select.Name}_selectCheck")
setAuths( "select.${table.Name}.${select.Name}", $selectBox, false, false, false, false );
Modified: trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigCombined.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigCombined.java 2009-01-06 13:24:00 UTC (rev 959)
+++ trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigCombined.java 2009-01-06 17:57:11 UTC (rev 960)
@@ -29,8 +29,10 @@
/**
* Combined the authorization and configuration settings for a user, his/her roles and the defaults.
* <p/>
- * Rules to apply :<br/> - Check whether personal choice indicates that the data should be hidden.<br/> - For each of
- * the roles for the user, get the specific rights.<br/> - If none found, use the defaults from the domain model.<br/> -
+ * Rules to apply :<br/>
+ * - Check whether personal choice indicates that the data should be hidden.<br/>
+ * - For each of the roles for the user, get the specific rights.<br/>
+ * - If none found, use the defaults from the domain model.<br/> -
* If one or more found, use the most permissable.
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
Modified: trunk/equanda-server/src/test/java/org/equanda/auth/AuthAndConfigCombinedTest.java
===================================================================
--- trunk/equanda-server/src/test/java/org/equanda/auth/AuthAndConfigCombinedTest.java 2009-01-06 13:24:00 UTC (rev 959)
+++ trunk/equanda-server/src/test/java/org/equanda/auth/AuthAndConfigCombinedTest.java 2009-01-06 17:57:11 UTC (rev 960)
@@ -38,7 +38,7 @@
private static AuthAndConfigProvider user = new ParsedAuthAndConfigProvider( "hide=H\n" +
"user=RWSLP\n" );
private static AuthAndConfigProvider role1 = new ParsedAuthAndConfigProvider( "hide=RWP\n" +
- "onerole=RSD\n" +
+ "onerole=RWSD\n" +
"rhide=H" );
private static AuthAndConfigProvider role2 = new ParsedAuthAndConfigProvider( "\n" );
private static AuthAndConfigProvider defaults = new ParsedAuthAndConfigProvider( "nouser=RWLP\n" +
@@ -71,7 +71,7 @@
assertFalse( test.isDeletable( "user" ) );
assertTrue( test.isReadable( "onerole" ) );
- assertFalse( test.isWritable( "onerole" ) );
+ assertTrue( test.isWritable( "onerole" ) );
assertTrue( test.isDisplaySummary( "onerole" ) );
assertFalse( test.isDisplayList( "onerole" ) );
assertFalse( test.isDisplayPrint( "onerole" ) );
@@ -82,7 +82,7 @@
assertFalse( test.isDisplaySummary( "nothing" ) );
assertFalse( test.isDisplayList( "nothing" ) );
assertFalse( test.isDisplayPrint( "nothing" ) );
- assertFalse( test.isDeletable( "nothing" ) );
+ assertTrue( test.isDeletable( "nothing" ) );
assertTrue( test.isReadable( "defaults" ) );
assertFalse( test.isWritable( "defaults" ) );
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/AuthReadableFactory.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/AuthReadableFactory.java 2009-01-06 13:24:00 UTC (rev 959)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/AuthReadableFactory.java 2009-01-06 17:57:11 UTC (rev 960)
@@ -63,7 +63,6 @@
{
public boolean get( AuthAndConfigProvider aac, String expression )
{
- System.out.println( "AAC readable "+expression+" "+aac.isReadable( expression ) );
return aac.isReadable( expression );
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
