Menu
▾
▴
uni-d-cvs — CVS commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(104) |
Dec
(17) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(38) |
Feb
(203) |
Mar
(127) |
Apr
(194) |
May
(139) |
Jun
(237) |
Jul
(241) |
Aug
(213) |
Sep
(105) |
Oct
(227) |
Nov
(221) |
Dec
(76) |
| 2005 |
Jan
(228) |
Feb
(318) |
Mar
(154) |
Apr
(128) |
May
(184) |
Jun
(78) |
Jul
(150) |
Aug
(125) |
Sep
(95) |
Oct
(103) |
Nov
(153) |
Dec
(131) |
| 2006 |
Jan
(42) |
Feb
(138) |
Mar
(134) |
Apr
(119) |
May
(455) |
Jun
(137) |
Jul
(164) |
Aug
(146) |
Sep
(85) |
Oct
(65) |
Nov
(68) |
Dec
(60) |
| 2007 |
Jan
(41) |
Feb
(40) |
Mar
(62) |
Apr
(70) |
May
(85) |
Jun
(23) |
Jul
(4) |
Aug
(8) |
Sep
(19) |
Oct
(15) |
Nov
(3) |
Dec
(6) |
| 2008 |
Jan
(22) |
Feb
(29) |
Mar
(16) |
Apr
|
May
(9) |
Jun
(25) |
Jul
|
Aug
(9) |
Sep
(12) |
Oct
(15) |
Nov
(18) |
Dec
(7) |
| 2009 |
Jan
(25) |
Feb
(25) |
Mar
(21) |
Apr
(26) |
May
(18) |
Jun
(5) |
Jul
(18) |
Aug
(8) |
Sep
(8) |
Oct
(5) |
Nov
|
Dec
|
|
From: <max...@us...> - 2009-05-15 12:55:49
|
Revision: 3836
http://uni-d.svn.sourceforge.net/uni-d/?rev=3836&view=rev
Author: max_brod
Date: 2009-05-15 12:55:37 +0000 (Fri, 15 May 2009)
Log Message:
-----------
Fix class names.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-13 12:37:53 UTC (rev 3835)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-15 12:55:37 UTC (rev 3836)
@@ -229,11 +229,16 @@
return ( getSize() != 0 ) ? getSize() : 20;
}
- public String getFieldSpecialClass()
+ public String getInputBoxClass()
{
- return "unidFieldClass_" + getFieldId();
+ return "unidFieldClass_" + getFieldId()+" linkInput displayInline";
}
+ public String getComboBoxClass()
+ {
+ return "unidFieldClass_" + getFieldId()+" linkCombobox displayInline";
+ }
+
public int getCalculatedMaxLength()
{
return ( getLength() != 0 ) ? getLength() : 20;
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-13 12:37:53 UTC (rev 3835)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-15 12:55:37 UTC (rev 3836)
@@ -56,7 +56,7 @@
<input jwcid="unidUoid" class="displayNone"/>
</span>
- <input jwcid="inputBox" class="ognl: getFieldSpecialClass() + 'linkInput displayInline'"
+ <input jwcid="inputBox" class="prop:inputBoxClass"
onfocus="inputBoxOnFocus(this)" onblur="prop:inputBoxBlur"/>
<span jwcid="@contrib:XTile" receiveName="ajaxLinkReceiveResponse" sendName="ajaxLinkSendRequest"
listener="listener:ajaxLinkHandler"/>
@@ -76,7 +76,7 @@
<span jwcid="@If" condition="prop:comboboxOrEmbedded">
- <input jwcid="unidComboboxLinkField" class="ognl: getFieldSpecialClass() + ' linkCombobox displayInline'"
+ <input jwcid="unidComboboxLinkField" class="prop:comboBoxClass"
onchange="prop:changeComboboxSelection"/>
<span jwcid="@If" condition="prop:notHiddenAnchors">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-05-13 12:38:02
|
Revision: 3835
http://uni-d.svn.sourceforge.net/uni-d/?rev=3835&view=rev
Author: pushkutza
Date: 2009-05-13 12:37:53 +0000 (Wed, 13 May 2009)
Log Message:
-----------
different ids from comboboxes and classes
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-13 12:36:53 UTC (rev 3834)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-13 12:37:53 UTC (rev 3835)
@@ -231,7 +231,7 @@
public String getFieldSpecialClass()
{
- return "unidFieldClass-" + getFieldId();
+ return "unidFieldClass_" + getFieldId();
}
public int getCalculatedMaxLength()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-05-13 12:37:06
|
Revision: 3834
http://uni-d.svn.sourceforge.net/uni-d/?rev=3834&view=rev
Author: pushkutza
Date: 2009-05-13 12:36:53 +0000 (Wed, 13 May 2009)
Log Message:
-----------
different ids from comboboxes and classes
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-12 12:22:35 UTC (rev 3833)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-13 12:36:53 UTC (rev 3834)
@@ -197,7 +197,7 @@
*/
@Component( type = "PropertySelection", id = "unidComboboxLinkField", inheritInformalParameters = true,
bindings = {
- "id = 'unidComboboxLinkField'",
+ "id = 'unidCombobox-' + getFieldId()",
"value = binderWrapper.uoid",
"displayName = displayName",
"model = selectionModel",
@@ -229,6 +229,11 @@
return ( getSize() != 0 ) ? getSize() : 20;
}
+ public String getFieldSpecialClass()
+ {
+ return "unidFieldClass-" + getFieldId();
+ }
+
public int getCalculatedMaxLength()
{
return ( getLength() != 0 ) ? getLength() : 20;
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-12 12:22:35 UTC (rev 3833)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-13 12:36:53 UTC (rev 3834)
@@ -56,7 +56,7 @@
<input jwcid="unidUoid" class="displayNone"/>
</span>
- <input jwcid="inputBox" class="linkInput displayInline"
+ <input jwcid="inputBox" class="ognl: getFieldSpecialClass() + 'linkInput displayInline'"
onfocus="inputBoxOnFocus(this)" onblur="prop:inputBoxBlur"/>
<span jwcid="@contrib:XTile" receiveName="ajaxLinkReceiveResponse" sendName="ajaxLinkSendRequest"
listener="listener:ajaxLinkHandler"/>
@@ -68,7 +68,7 @@
<span jwcid="@LinkSubmit" onclick="clearValidation(this);"
listener="listener:prepareReturnHandler" action="listener:searchByDescriptionPart"/>
<span jwcid="@LinkSubmit" onclick="clearValidation(this);"
- listener="listener:prepareReturnHandler" action="listener:searchFullText"/>
+ listener="listener:prepareReturnHandler" action="listener:searchFullText"/>
</span>
</span>
@@ -76,11 +76,12 @@
<span jwcid="@If" condition="prop:comboboxOrEmbedded">
- <input jwcid="unidComboboxLinkField" class="displayInline" onchange="prop:changeComboboxSelection"/>
+ <input jwcid="unidComboboxLinkField" class="ognl: getFieldSpecialClass() + ' linkCombobox displayInline'"
+ onchange="prop:changeComboboxSelection"/>
<span jwcid="@If" condition="prop:notHiddenAnchors">
<span jwcid="@LinkSubmit" onclick="clearValidation(this);" class="addLinkClass displayInline"
- listener="listener:prepareReturnHandler" action="listener:runAdd" id="prop:addId">
+ listener="listener:prepareReturnHandler" action="listener:runAdd" id="prop:addId">
<span key="Add"/>
</span>
@@ -91,7 +92,8 @@
<span jwcid="display@LinkSubmit" onclick="clearValidation(this);" class="viewLinkClass displayInline"
listener="listener:prepareReturnHandler" action="listener:runView" id="prop:viewId">
<span jwcid="@If" condition="prop:comboboxOrEmbedded">
- <span jwcid="@If" condition="prop:valueSet"><span class="viewLinkClassCombobox"><span key="View"/></span></span>
+ <span jwcid="@If" condition="prop:valueSet"><span class="viewLinkClassCombobox"><span
+ key="View"/></span></span>
</span>
<span jwcid="@Else">
<span class="viewLinkClassInput"><span jwcid="@Insert" value="prop:calculateDisplay"/></span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-05-12 12:32:59
|
Revision: 3833
http://uni-d.svn.sourceforge.net/uni-d/?rev=3833&view=rev
Author: pushkutza
Date: 2009-05-12 12:22:35 +0000 (Tue, 12 May 2009)
Log Message:
-----------
ICT-1592 & ICT-1591
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.html
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.script
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-11 12:08:53 UTC (rev 3832)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.java 2009-05-12 12:22:35 UTC (rev 3833)
@@ -477,7 +477,7 @@
public String getSelectCssStyle()
{
- return isCombobox() ? "displayNone" : "displayInline";
+ return isCombobox() ? "displayNone" : "selectLinkClass displayInline";
}
public boolean isValueSet()
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.java 2009-05-11 12:08:53 UTC (rev 3832)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.java 2009-05-12 12:22:35 UTC (rev 3833)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -27,17 +27,13 @@
import be.unid.tapestry.binder.FieldBinder;
import be.unid.tapestry.components.UnidBaseComponent;
-import static be.unid.tapestry.components.shared.ConfigurationKeys.GUI_MAX_FIELD_LENGTH;
-import be.unid.tapestry.components.shared.ConfigurationKeys;
import be.unid.tapestry.components.input.unidTimestamp.UnidTimestamp;
import be.unid.tapestry.components.input.unidWikiInput.UnidWikiInput;
import be.unid.tapestry.model.Renderer;
import be.unid.tapestry.selectionModel.UnidSelectionModel;
import be.unid.tapestry.translator.UnidDateTranslator;
-import be.unid.tapestry.translator.UnidIntTranslator;
import be.unid.tapestry.translator.TranslatorFactory;
import be.unid.tapestry.util.FieldType;
-import be.unid.tapestry.util.ResourceUtil;
import be.unid.tapestry.validator.ValidatorFactory;
import net.sf.tacos.ajax.components.DatePicker;
import org.apache.tapestry.IAsset;
@@ -47,10 +43,7 @@
import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.form.*;
-import org.apache.tapestry.form.translator.NumberTranslator;
-import org.apache.tapestry.form.translator.StringTranslator;
import org.apache.tapestry.form.translator.Translator;
-import org.apache.tapestry.form.validator.Required;
import org.apache.tapestry.form.validator.Validator;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -142,6 +135,9 @@
@Asset( value = "/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.html" )
public abstract IAsset get$template();
+ @Asset( value = "/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.script" )
+ public abstract IAsset getUnidSimpleInputScript();
+
/*
* ********************************* Component definitions: **********************************
*/
@@ -165,10 +161,10 @@
"style = getInformalParameters().get('style')",
"onclick = getInformalParameters().get('onclick')",
"onblur = getInformalParameters().get('onblur')",
- "onfocus = getInformalParameters().get('onfocus')",
+ "onfocus = getOnFocusFunction()",
"onkeyup = getOnKeyUpTextField()",
"onkeydown = getInformalParameters().get('onkeydown')"
- } )
+ } )
public abstract TextField getUnidTextLineField();
/*
@@ -189,7 +185,7 @@
"style = getInformalParameters().get('style')",
"onclick = getInformalParameters().get('onclick')",
"onblur = getInformalParameters().get('onblur')",
- "onfocus = getInformalParameters().get('onfocus')",
+ "onfocus = getOnFocusFunction()",
"onkeyup = getOnKeyUpTextField()",
"onkeydown = getInformalParameters().get('onkeydown')" } )
public abstract TextArea getUnidTextAreaField();
@@ -207,6 +203,13 @@
return text.toString();
}
+ public String getOnFocusFunction()
+ {
+ String onfocus = "unidSelectContentOnFocus(this);";
+ if ( getInformalParameters().get( "onfocus" ) != null ) onfocus += getInformalParameters().get( "onfocus" );
+ return onfocus;
+ }
+
/*
* For Wiki.
*/
@@ -236,7 +239,7 @@
"translator = buildTranslator()",
"validators = buildValidators()",
"onChange = onChange"
- } )
+ } )
public abstract TextArea getUnidBlobField();
/*
@@ -524,4 +527,5 @@
{
return getSuggestSelectionModel() != null;
}
+
}
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-11 12:08:53 UTC (rev 3832)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-12 12:22:35 UTC (rev 3833)
@@ -91,10 +91,10 @@
<span jwcid="display@LinkSubmit" onclick="clearValidation(this);" class="viewLinkClass displayInline"
listener="listener:prepareReturnHandler" action="listener:runView" id="prop:viewId">
<span jwcid="@If" condition="prop:comboboxOrEmbedded">
- <span jwcid="@If" condition="prop:valueSet"><span key="View"/></span>
+ <span jwcid="@If" condition="prop:valueSet"><span class="viewLinkClassCombobox"><span key="View"/></span></span>
</span>
<span jwcid="@Else">
- <span jwcid="@Insert" value="prop:calculateDisplay"/>
+ <span class="viewLinkClassInput"><span jwcid="@Insert" value="prop:calculateDisplay"/></span>
</span>
</span>
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.html 2009-05-11 12:08:53 UTC (rev 3832)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.html 2009-05-12 12:22:35 UTC (rev 3833)
@@ -32,6 +32,8 @@
@version $Revision$
</span>
+<span jwcid="@Script" scriptAsset="asset:unidSimpleInputScript"/>
+
<span jwcid="@If" condition="ognl:fieldWithSuggestSelectionModel">
<input jwcid="unidSuggestValueListField"/>
</span>
Added: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.script
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.script (rev 0)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.script 2009-05-12 12:22:35 UTC (rev 3833)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE script PUBLIC
+ "-//Apache Software Foundation//Tapestry Script Specification 3.0//EN"
+ "http://jakarta.apache.org/tapestry/dtd/Script_3_0.dtd">
+<script>
+ <body>
+ <unique>
+ <![CDATA[
+ function unidSelectContentOnFocus( elem )
+ {
+ try
+ {
+ if ( elem )
+ {
+ elem.select();
+ }
+ }
+ catch( e )
+ {/*ignore*/}
+ }
+]]>
+ </unique>
+
+
+ </body>
+</script>
Property changes on: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidSimpleInput/UnidSimpleInput.script
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-11 12:09:00
|
Revision: 3832
http://uni-d.svn.sourceforge.net/uni-d/?rev=3832&view=rev
Author: max_brod
Date: 2009-05-11 12:08:53 +0000 (Mon, 11 May 2009)
Log Message:
-----------
[UNI-462]
Changes in the Select page, to be used to edit a multiple field too. So far only usable for editing bidirectional link fields.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelect/UnidSelect.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPageParams.java
trunk/Uni-d/tapestry/src/main/resources/Uni-d-tapestry.library
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.html
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelect/UnidSelect.html
trunk/Uni-d/template/src/main/webapp/translations-common.txt
trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/SelectReturnHandler.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAlways.java
Removed Paths:
-------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/multipleField/
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -28,21 +28,8 @@
import be.unid.tapestry.binder.FieldBinder;
import be.unid.tapestry.binder.MultipleFieldBinderSource;
import be.unid.tapestry.components.input.DescriptionInputContainerImpl;
-import be.unid.tapestry.components.shared.DescriptionFactory;
-import be.unid.tapestry.components.shared.ConfigurationKeys;
import be.unid.tapestry.util.DisplayMode;
import be.unid.tapestry.util.UnidProxyAccessor;
-import be.unid.tapestry.util.FieldType;
-import be.unid.tapestry.util.ResourceUtil;
-import be.unid.tapestry.pages.add.AddPage;
-import be.unid.tapestry.pages.multipleField.MultipleFieldPage;
-import be.unid.tapestry.pages.multipleField.MultipleFieldPageReturnHandler;
-import be.unid.tapestry.model.GMField;
-import be.unid.tapestry.model.GMTable;
-import be.unid.tapestry.navigation.ReturnHandlerEmpty;
-import be.unid.tapestry.navigation.NavigationablePage;
-import be.unid.tapestry.navigation.PageParameters;
-import be.unid.persistence.om.UnidProxy;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Component;
@@ -266,46 +253,4 @@
return "javascript:removeMultipleSubmit(this, \'" + getTableName() + '_' + getFieldName() + "\');";
}
- public boolean isShownFully()
- {
- if ( FieldType.TYPE_LINK != getFieldDescription().getFieldType() ) return true;
- if ( getFieldDescription().getReferenceField() == null ) return true;
- if ( getValues().size() < ResourceUtil.getConfigInt( ConfigurationKeys.MAX_MULTIPLE_FIELDS_RECORDS_IN_PAGE) ) return true;
- return false;
- }
-
- // these need to be saved before the action is run
- public abstract UnidProxy getProxySaved();
-
- public abstract void setProxySaved( UnidProxy proxy );
-
- public abstract GMField getFieldDescriptionSaved();
-
- public abstract void setFieldDescriptionSaved( GMField field );
-
- public abstract DisplayMode getDisplayModeSaved();
-
- public abstract void setDisplayModeSaved( DisplayMode display );
-
- public void prepareMultipleFieldsDetails()
- {
- setProxySaved( getProxy() );
- setFieldDescriptionSaved( getFieldDescription() );
- setDisplayModeSaved( getDisplayMode() );
- MultipleFieldPageReturnHandler returnHandler=new MultipleFieldPageReturnHandler();
- returnHandler.setBinder( getFieldBinder());
- getNavPage().getPageParameters().setReturnHandler( returnHandler );
- }
-
- public void showMultipleFieldsDetails()
- {
- MultipleFieldPage page =
- (MultipleFieldPage) getNavigationManager().getForwardPage( getNavPage(), "MultipleFieldPage", true );
-
- page.getPageParameters().setFieldDescription( getFieldDescriptionSaved() );
- page.getPageParameters().setDisplayMode( getDisplayModeSaved() );
- page.getPageParameters().setMainRecordProxy( getProxySaved() );
- getNavigationManager().forward( page );
- }
-
}
\ No newline at end of file
Added: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/SelectReturnHandler.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/SelectReturnHandler.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/SelectReturnHandler.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -0,0 +1,100 @@
+/**
+ * This file is part of the Uni-d project.
+ * $Id$
+ *
+ * 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 be.unid.tapestry.components.select;
+
+import be.unid.tapestry.navigation.ReturnHandler;
+import be.unid.tapestry.navigation.NavigationablePage;
+import be.unid.tapestry.navigation.PageParameters;
+import be.unid.tapestry.navigation.HasProxyParameter;
+import be.unid.tapestry.binder.FieldBinder;
+import be.unid.tapestry.binder.ProxyBinderSource;
+import be.unid.tapestry.pages.select.SelectPageParams;
+import be.unid.tapestry.pages.select.SelectPage;
+import be.unid.tapestry.util.UnidProxyAccessor;
+import be.unid.persistence.om.UnidProxy;
+
+/**
+ * Custom return handler for the select page
+ * Used for when editing too, treating the return for the new added element.
+ *
+ * @author Florin
+ * @version $Revision$
+ */
+public class SelectReturnHandler
+ implements ReturnHandler
+{
+ private static final org.apache.log4j.Logger log =
+ org.apache.log4j.Logger.getLogger( SelectReturnHandler.class );
+
+ private SelectPageParams pp;
+ private FieldBinder binder;
+ private ReturnHandler previous;
+
+ protected SelectReturnHandler() {}
+
+ public SelectReturnHandler( SelectPageParams parameters, FieldBinder binder,
+ ReturnHandler previous )
+ {
+ this.pp = parameters;
+ this.binder = binder;
+ this.previous = previous;
+ }
+
+ public void handleReturn( NavigationablePage toPage, PageParameters currentParams,
+ PageParameters fromParams )
+ {
+
+ HasProxyParameter receivedParams = (HasProxyParameter) fromParams;
+ if ( receivedParams.getProxy() != null )
+ {
+ if ( toPage instanceof SelectPage )
+ {
+ try
+ {
+ UnidProxy receivedProxy = receivedParams.getProxy();
+ UnidProxy containerProxy =
+ ( (SelectPageParams) toPage.getPageParameters() ).getContainerProxyToAdd();
+
+ UnidProxyAccessor.setField( containerProxy, ( (SelectPageParams) toPage.getPageParameters() )
+ .getContainerDescription().getName(), receivedProxy.getClass(), receivedProxy );
+ }
+ catch ( Exception e )
+ {
+ log.error( e, e );
+ }
+ }
+ }
+ }
+
+ public FieldBinder getBinder()
+ {
+ return previous.getBinder();
+ }
+
+ public void setBinder( FieldBinder binder )
+ {
+ previous.setBinder( binder );
+ }
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/SelectReturnHandler.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelect/UnidSelect.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelect/UnidSelect.java 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelect/UnidSelect.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -26,16 +26,25 @@
package be.unid.tapestry.components.select.unidSelect;
import be.unid.tapestry.components.UnidBaseComponent;
+import be.unid.tapestry.components.input.unidSingleField.UnidSingleField;
import be.unid.tapestry.components.select.SelectObject;
import be.unid.tapestry.components.select.unidSelectParameters.UnidSelectParameters;
import be.unid.tapestry.components.select.unidSelectResults.UnidSelectResults;
import be.unid.tapestry.model.GMSelect;
+import be.unid.tapestry.model.GMField;
import be.unid.tapestry.util.UnidFormValidator;
+import be.unid.tapestry.util.DisplayMode;
+import be.unid.tapestry.util.UnidProxyAccessor;
+import be.unid.tapestry.navigation.NavigationablePageImpl;
+import be.unid.tapestry.pages.select.SelectPage;
+import be.unid.persistence.om.UnidProxy;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.annotations.*;
import org.apache.tapestry.valid.ValidationDelegate;
+import java.util.Collection;
+
/**
* Description!!!
*
@@ -75,6 +84,15 @@
@Parameter( name = "sortAscending", defaultValue = "false" )
public abstract boolean isSortAscending();
+ @Parameter( name = "editing", defaultValue = "false" )
+ public abstract boolean isEditing();
+
+ @Parameter( name = "editedFieldDescription" )
+ public abstract GMField getEditedFieldDescription();
+
+ @Parameter( name = "editedFieldValue" )
+ public abstract Object getEditedFieldValue();
+
/*
* ********************************** Assets defintions: *************************************
*/
@@ -106,7 +124,11 @@
"autoRunSelect = autoRunSelect",
"sortField = sortField",
"sortAscending = sortAscending",
- "displayedPageNumber = displayedPageNumber" } )
+ "displayedPageNumber = displayedPageNumber",
+ "editing = editing",
+ "editedFieldDescription = editedFieldDescription",
+ "editedFieldValue = editedFieldValue"
+ } )
public abstract UnidSelectResults getUnidSelectResultsComponent();
/*
@@ -125,10 +147,10 @@
public String getLegend()
{
- if (getSelectObject().isUseCustomQuery()) return getMessages().getMessage("Find");
- if (getSelectDescription().getName().equals("UnidFullText"))
+ if ( getSelectObject().isUseCustomQuery() ) return getMessages().getMessage( "Find" );
+ if ( getSelectDescription().getName().equals( "UnidFullText" ) )
{
- return getMessages().getMessage( "Find" ) + " " +getMessages().getMessage( "FullTextSelectTitle");
+ return getMessages().getMessage( "Find" ) + " " + getMessages().getMessage( "FullTextSelectTitle" );
}
return getMessages().getMessage( "Find" ) + " " +
getMessages().getMessage( "select." + getSelectDescription().getTable().getName() + "." +
@@ -137,7 +159,50 @@
public String getCssClass()
{
- if (getSelectObject().isUseCustomQuery()) return "displayBlock";
+ if ( getSelectObject().isUseCustomQuery() ) return "displayBlock";
return ( getSelectDescription().getSelections().size() == 0 ) ? "displayNone" : "displayBlock";
}
+
+ public void back()
+ {
+ ( (NavigationablePageImpl) getNavPage() ).back();
+ }
+
+ public void add()
+ {
+ try
+ {
+ UnidProxy container = ( (SelectPage) getPage() ).getPageParameters().getContainerProxyToAdd();
+ GMField containerDescription = ( (SelectPage) getPage() ).getPageParameters().getContainerDescription();
+ UnidProxy toAdd = (UnidProxy) UnidProxyAccessor.getField( container, containerDescription.getName() );
+ if ( toAdd != null )
+ {
+ if ( getEditedFieldDescription().isMultiple() )
+ {
+ Collection currentValues =
+ (Collection) UnidProxyAccessor.getField( toAdd, getEditedFieldDescription().getName() );
+ currentValues.add( getEditedFieldValue() );
+ UnidProxyAccessor
+ .setField( toAdd, getEditedFieldDescription().getName(), Collection.class, currentValues );
+ toAdd.unidUpdate();
+ }
+ }
+ }
+ catch ( Exception e )
+ {
+ log.error( e, e );
+ }
+ }
+
+ @Component( type = "UnidSingleField", id = "fieldToAdd",
+ bindings = {
+ "proxy = getPage().getPageParameters().containerProxyToAdd",
+ "fieldDescription = getPage().getPageParameters().containerDescription",
+ "displayMode = displayMode" } )
+ public abstract UnidSingleField getFieldToAdd();
+
+ public DisplayMode getDisplayMode()
+ {
+ return DisplayMode.ADD;
+ }
}
\ No newline at end of file
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -49,6 +49,7 @@
import be.unid.tapestry.useradmin.cache.LoaderType;
import be.unid.tapestry.util.ResourceUtil;
import be.unid.tapestry.util.UnidProxyAccessor;
+import be.unid.tapestry.util.FieldType;
import com.lowagie.text.*;
import com.lowagie.text.pdf.PdfPTable;
import com.lowagie.text.pdf.PdfWriter;
@@ -83,11 +84,14 @@
/*
* Parameter definitions:
*/
+ @Parameter( name = "editing", defaultValue = "false" )
+ public abstract boolean isEditing();
- @Parameter( name = "directValues" )
- public abstract List<UnidProxy> getDirectValues();
+ @Parameter( name = "editedFieldDescription" )
+ public abstract GMField getEditedFieldDescription();
- public abstract void setDirectValues( List<UnidProxy> values );
+ @Parameter( name = "editedFieldValue" )
+ public abstract Object getEditedFieldValue();
@Parameter( name = "table" )
public abstract GMTable getTable();
@@ -263,33 +267,26 @@
List<UnidProxy> allList;
- if ( getDirectValues() != null )
+ try
{
- allList = getDirectValues();
- }
- else
- {
- try
+ if ( getNavPage().getPageParameters().getSelectorsState() != null )
{
- if ( getNavPage().getPageParameters().getSelectorsState() != null )
- {
- SelectorsState.setSelectorsState( getNavPage().getPageParameters().getSelectorsState() );
- }
- allList = getSelectObject().find();
+ SelectorsState.setSelectorsState( getNavPage().getPageParameters().getSelectorsState() );
}
- catch ( InvocationTargetException e )
- {
- log.error( e.getTargetException(), e.getTargetException() );
- setError( getTranslatedExceptionMessage( e.getTargetException() ) );
- return;
- }
- catch ( Exception e )
- {
- log.error( e, e );
- setError( getTranslatedExceptionMessage( e ) );
- return;
- }
+ allList = getSelectObject().find();
}
+ catch ( InvocationTargetException e )
+ {
+ log.error( e.getTargetException(), e.getTargetException() );
+ setError( getTranslatedExceptionMessage( e.getTargetException() ) );
+ return;
+ }
+ catch ( Exception e )
+ {
+ log.error( e, e );
+ setError( getTranslatedExceptionMessage( e ) );
+ return;
+ }
int size = allList.size();
setPageCount( calcPageCount( size ) );
@@ -359,22 +356,36 @@
if ( log.isDebugEnabled() ) log.debug( "UnidSelectResults.remove - remove proxy uoid = " + uoid );
try
{
- if ( getDirectValues() != null )
+ if ( isEditing() )
{
- List<UnidProxy> values = getDirectValues();
- values.remove( UnidProxyAccessor.findUoid( getTableName(), uoid ) );
- setDirectValues( values );
+ UnidProxy proxyToEdit=UnidProxyAccessor.findUoid( getTableName(), uoid );
+ if (proxyToEdit==null)
+ {
+ log.error("Could not find record with uoid "+uoid);
+ }
+ else
+ {
+ // so far only needed for this case
+ if (getEditedFieldDescription().isMultiple() )
+ {
+ Collection currentValues= (Collection)UnidProxyAccessor.getField( proxyToEdit, getEditedFieldDescription().getName());
+ currentValues.remove( getEditedFieldValue());
+ UnidProxyAccessor.setField( proxyToEdit,getEditedFieldDescription().getName(), Collection.class, currentValues);
+ proxyToEdit.unidUpdate();
+ }
+ }
}
else
{
UnidProxyAccessor.findUoid( getTableName(), uoid ).removeEntityBean();
}
}
- catch ( UnidPersistenceException upe )
+ catch ( Exception upe )
{
log.error( upe, upe );
setError( getTranslatedExceptionMessage( upe ) );
}
+
find( getDisplayedPageNumber() );
}
@@ -794,7 +805,7 @@
{
displayedFields.add( new FakeGmField( FakeGmField.Type.VIEW ) );
displayedFields.add( new FakeGmField( FakeGmField.Type.EDIT ) );
- if ( getDirectValues() != null || getSessionUserAdmin().isTableRemoveable( tableDesc ) )
+ if ( isEditing() || getSessionUserAdmin().isTableRemoveable( tableDesc ) )
{
displayedFields.add( new FakeGmField( FakeGmField.Type.REMOVE ) );
}
@@ -819,7 +830,7 @@
public boolean isShowReports()
{
- return getDirectValues() == null;
+ return !isEditing();
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -45,5 +45,4 @@
public static final String LOGO_FILE = "logo-file";
public static final String MAX_ALERTS = "max-alerts";
public static final String ALERTS_SHOW_WARNINGS = "alerts-show-warnings";
- public static final String MAX_MULTIPLE_FIELDS_RECORDS_IN_PAGE = "max-multiple-field-records-in-page";
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -53,7 +53,11 @@
"autoRunSelect = PageParameters.autoRunSelect",
"sortField = PageParameters.sortField",
"sortAscending = PageParameters.sortAscending",
- "displayedPageNumber = PageParameters.displayedPageNumber" } )
+ "displayedPageNumber = PageParameters.displayedPageNumber",
+ "editing = PageParameters.editing",
+ "editedFieldDescription = PageParameters.editedFieldDescription",
+ "editedFieldValue = PageParameters.editedFieldValue"
+ } )
public abstract UnidSelect getSelectComponent();
@Override
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPageParams.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPageParams.java 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPageParams.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -27,14 +27,16 @@
import be.unid.persistence.om.UnidProxy;
import be.unid.tapestry.components.select.SelectObject;
+import be.unid.tapestry.components.select.SelectReturnHandler;
import static be.unid.tapestry.components.shared.ConfigurationKeys.GUI_SELECT_PAGE_SIZE;
import be.unid.tapestry.components.shared.DescriptionFactory;
import be.unid.tapestry.model.GMSelect;
-import be.unid.tapestry.navigation.HasProxyParameter;
-import be.unid.tapestry.navigation.HasSelectParameter;
-import be.unid.tapestry.navigation.PageParameters;
-import be.unid.tapestry.navigation.PageParametersImpl;
+import be.unid.tapestry.model.GMField;
+import be.unid.tapestry.model.GMTable;
+import be.unid.tapestry.navigation.*;
import be.unid.tapestry.util.ResourceUtil;
+import be.unid.tapestry.util.UnidProxyAccessor;
+import be.unid.tapestry.binder.FieldBinder;
/**
* Description!!!
@@ -57,9 +59,15 @@
protected boolean sortAscending;
protected Boolean select;
protected boolean useCustomQuery;
+ protected boolean editing; // will also allow to add/remove records
+ protected GMField editedFieldDescription; // what field must be set
+ protected Object editedFieldValue; // what value to set in the field
protected UnidProxy proxy; // this is just to work with return handler ... should only be used for select
+ protected UnidProxy containerProxyToAdd; // proxy containing a link to a record of this table. We need this for adding new records, when editing
+ protected GMField containerDescription; // description of the field, needed to add a new record, when editing. The client code has to provide this.
+
public String getTableName()
{
return tableName;
@@ -197,6 +205,60 @@
this.useCustomQuery = useCustomQuery;
}
+ public boolean isEditing()
+ {
+ return editing;
+ }
+
+ public void setEditing( boolean editing )
+ {
+ this.editing = editing;
+ }
+
+ public GMField getEditedFieldDescription()
+ {
+ return editedFieldDescription;
+ }
+
+ public void setEditedFieldDescription( GMField editedFieldDescription )
+ {
+ this.editedFieldDescription = editedFieldDescription;
+ }
+
+ public Object getEditedFieldValue()
+ {
+ return editedFieldValue;
+ }
+
+ public void setEditedFieldValue( Object editedFieldValue )
+ {
+ this.editedFieldValue = editedFieldValue;
+ }
+
+ public UnidProxy getContainerProxyToAdd()
+ {
+ if ( containerProxyToAdd == null )
+ {
+ containerProxyToAdd = UnidProxyAccessor.createProxy( containerDescription.getTableName() );
+ }
+ return containerProxyToAdd;
+ }
+
+ public void setContainerProxyToAdd( UnidProxy containerProxyToAdd )
+ {
+ this.containerProxyToAdd = containerProxyToAdd;
+ }
+
+ public GMField getContainerDescription()
+ {
+ return containerDescription;
+ }
+
+ public void setContainerDescription( GMField containerDescription )
+ {
+ this.containerDescription = containerDescription;
+ }
+
@Override
public SelectPageParams clone( PageParameters newParams )
{
@@ -211,6 +273,11 @@
clone.setSortAscending( isSortAscending() );
clone.setShowSelect( isShowSelect() );
clone.setUseCustomQuery( isUseCustomQuery() );
+ clone.setEditing( isEditing() );
+ clone.setEditedFieldDescription( getEditedFieldDescription() );
+ clone.setEditedFieldValue( getEditedFieldValue() );
+ clone.setContainerProxyToAdd( getContainerProxyToAdd() );
+ clone.setContainerDescription( getContainerDescription() );
if ( proxy != null ) clone.setProxy( proxy.cloneProxy( true ) );
return clone;
@@ -222,6 +289,25 @@
return new SelectPageParams();
}
+ public ReturnHandler buildReturnHandler( FieldBinder binder )
+ {
+ final ReturnHandler previous = super.buildReturnHandler( binder );
+
+ if ( !isEditing() ) return previous;
+
+ String fieldName = binder.getFieldDescription().getName();
+ String tableName= binder.getFieldDescription().getTableName();
+
+ if ( previous != null && ( !fieldName.equals( getContainerDescription().getName()) || !tableName.equals(getContainerDescription().getTableName())))
+ {
+ return previous;
+ }
+ // build a wraper aroundthe standard retun handler to add extra checks and modifications
+
+ setReturnHandler( new SelectReturnHandler( this, binder, previous ));
+ return getReturnHandler();
+ }
+
@Override
public String toString()
{
Added: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAlways.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAlways.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAlways.java 2009-05-11 12:08:53 UTC (rev 3832)
@@ -0,0 +1,40 @@
+/**
+ * This file is part of the Uni-d project.
+ * $Id$
+ *
+ * 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 be.unid.tapestry.validation;
+
+/**
+ * Hide if class to hide an item always. It's a trick to have hidden fields still existing in the gui descriptors
+ *
+ * @author Florin
+ * @version $Revision$
+ */
+public class HideIfAlways
+ extends HideIfAdapter
+{
+ public boolean isHidden()
+ {
+ return true;
+ }
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAlways.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Uni-d/tapestry/src/main/resources/Uni-d-tapestry.library
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/Uni-d-tapestry.library 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/resources/Uni-d-tapestry.library 2009-05-11 12:08:53 UTC (rev 3832)
@@ -29,7 +29,6 @@
be.unid.tapestry.pages.fullTextSearch,
be.unid.tapestry.pages.generalText,
be.unid.tapestry.pages.help,
- be.unid.tapestry.pages.multipleField,
be.unid.tapestry.pages.select,
be.unid.tapestry.pages.tableManager,
be.unid.tapestry.pages.tablesIndex,
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.html 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.html 2009-05-11 12:08:53 UTC (rev 3832)
@@ -31,82 +31,72 @@
@version $Revision$
-</span>
+</span>
-<span jwcid="@If" condition="prop:shownFully">
- <table jwcid="@Any" id="prop:tableId" class="displayInline">
- <tbody>
- <input jwcid="removeListField" class="displayNone"/>
- <tr>
- <td colspan="2" align="left">
- <span jwcid="@If" condition="prop:addShown">
- <a jwcid="@Any" href="javascript:;"
- onclick="prop:javascriptStringAddMultiple"
- id="prop:insertId">
- <span key="Insert"/>
- </a>
-
- <select jwcid="noOfAddsDropList"/>
- </span>
- </td>
- </tr>
+<table jwcid="@Any" id="prop:tableId" class="displayInline">
+<tbody>
+ <input jwcid="removeListField" class="displayNone"/>
- <tr jwcid="foreachValue">
- <td align="left">
- <span jwcid="@If" condition="prop:fieldLink">
- <span jwcid="@If" condition="prop:attachment">
- <input jwcid="unidAttachment"/>
- </span>
- <span jwcid="@Else">
- <input jwcid="unidLinkInput"/>
- </span>
+ <tr>
+ <td colspan="2" align="left">
+ <span jwcid="@If" condition="prop:addShown">
+ <a jwcid="@Any" href="javascript:;"
+ onclick="prop:javascriptStringAddMultiple"
+ id="prop:insertId">
+ <span key="Insert"/>
+ </a>
+
+ <select jwcid="noOfAddsDropList"/>
+ </span>
+ </td>
+ </tr>
+
+ <tr jwcid="foreachValue">
+ <td align="left">
+ <span jwcid="@If" condition="prop:fieldLink">
+ <span jwcid="@If" condition="prop:attachment">
+ <input jwcid="unidAttachment"/>
</span>
<span jwcid="@Else">
- <input jwcid="unidSimpleInput"/>
+ <input jwcid="unidLinkInput"/>
</span>
- </td>
- <td>
- <span jwcid="@If" condition="prop:checkBoxShown">
- <input jwcid="@Any" type="checkbox"
- id="prop:removeCheckboxId"/>
- </span>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="left">
- <span jwcid="@If" condition="prop:removeShown">
- <a jwcid="@Any" href="javascript:;"
- onclick="prop:javascriptStringRemoveMultiple"
- id="prop:removeId">
- <span key="Remove"/>
- </a>
- </span>
- </td>
- </tr>
- <span class="displayNone">
- <input jwcid="@Submit" id="prop:addMultipleId"
- listener="listener:addMultipleValues" parameters="prop:fieldName"/>
- <input jwcid="@Submit" id="prop:removeMultipleId"
- listener="listener:removeMultipleValues" parameters="prop:fieldName"/>
- </span>
- </tbody>
- </table>
-
-
- <span jwcid="@Script" scriptAsset="asset:multipleFieldScript"
- fieldID="prop:fieldId"
- tableID="prop:tableId"
- prefixForAddSubmit="addMultiple_"
- prefixForRemoveSubmit="removeMultiple_"
- prefixForRemoveCheckBox="removeCheckBox_"
- prefixRemoveList="removeList_"/>
-</span>
-
-<span jwcid="@Else">
- <span jwcid="@LinkSubmit" onclick="clearValidation(this);"
- listener="listener:prepareMultipleFieldsDetails"
- action="listener:showMultipleFieldsDetails">
- <span jwcid="@Insert" value="message:ShowMultipleFieldDetails"/>
+ </span>
+ <span jwcid="@Else">
+ <input jwcid="unidSimpleInput"/>
+ </span>
+ </td>
+ <td>
+ <span jwcid="@If" condition="prop:checkBoxShown">
+ <input jwcid="@Any" type="checkbox"
+ id="prop:removeCheckboxId"/>
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="left">
+ <span jwcid="@If" condition="prop:removeShown">
+ <a jwcid="@Any" href="javascript:;"
+ onclick="prop:javascriptStringRemoveMultiple"
+ id="prop:removeId">
+ <span key="Remove"/>
+ </a>
+ </span>
+ </td>
+ </tr>
+ <span class="displayNone">
+ <input jwcid="@Submit" id="prop:addMultipleId"
+ listener="listener:addMultipleValues" parameters="prop:fieldName"/>
+ <input jwcid="@Submit" id="prop:removeMultipleId"
+ listener="listener:removeMultipleValues" parameters="prop:fieldName"/>
</span>
-</span>
\ No newline at end of file
+</tbody>
+</table>
+
+<span jwcid="@Script" scriptAsset="asset:multipleFieldScript"
+ fieldID="prop:fieldId"
+ tableID="prop:tableId"
+ prefixForAddSubmit="addMultiple_"
+ prefixForRemoveSubmit="removeMultiple_"
+ prefixForRemoveCheckBox="removeCheckBox_"
+ prefixRemoveList="removeList_"/>
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelect/UnidSelect.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelect/UnidSelect.html 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelect/UnidSelect.html 2009-05-11 12:08:53 UTC (rev 3832)
@@ -46,3 +46,18 @@
</form>
<span jwcid="unidSelectResults"/>
+
+<span jwcid="@If" condition="prop:editing">
+ <form jwcid="@Form"
+ delegate="bean:validationDelegate"
+ clientValidationEnabled="literal:true"
+ enctype="multipart/form-data" focus="literal:false" class="prop:cssClass">
+
+ <fieldset>
+ <legend><span jwcid="@Insert" value="message:Add"/></legend>
+ <span jwcid="fieldToAdd"/>
+ <input jwcid="@Submit" class="submitButton" value="message:Add" action="listener:add"/>
+ </fieldset>
+ <input jwcid="@Submit" class="submitButton" value="message:Back" action="listener:back"/>
+ </form>
+</span>
\ No newline at end of file
Modified: trunk/Uni-d/template/src/main/webapp/translations-common.txt
===================================================================
--- trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-05-11 12:08:53 UTC (rev 3832)
@@ -1074,10 +1074,6 @@
.label.nl D
.label.ro D
.label.fr D
-.key ShowMultipleFieldDetails/Uni-d-fixed
-.label.en Details
-.label.nl Details
-.label.ro Detalii
-.label.fr Details
+
Modified: trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties
===================================================================
--- trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties 2009-05-08 12:09:42 UTC (rev 3831)
+++ trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties 2009-05-11 12:08:53 UTC (rev 3832)
@@ -11,4 +11,3 @@
max-alerts=20
alerts-show-warnings=true
;configure-border-extra-class=XXX
-max-multiple-field-records-in-page=3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-08 12:09:55
|
Revision: 3831
http://uni-d.svn.sourceforge.net/uni-d/?rev=3831&view=rev
Author: max_brod
Date: 2009-05-08 12:09:42 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Report servlet address is no longer taken from config.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/Report.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.html
trunk/Uni-d/template/src/main/webapp/ReportScript.js
Removed Paths:
-------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ReportServerURLProvider.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.script
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/Report.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/Report.java 2009-05-07 14:28:34 UTC (rev 3830)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/Report.java 2009-05-08 12:09:42 UTC (rev 3831)
@@ -27,8 +27,6 @@
import be.unid.tapestry.navigation.NavigationablePageImpl;
import be.unid.tapestry.util.UnidFormValidator;
-import be.unid.tapestry.util.ResourceUtil;
-import be.unid.tapestry.util.ReportServerURLProvider;
import be.unid.reporting.parser.ReportParameter;
import org.apache.tapestry.annotations.Bean;
import org.apache.tapestry.annotations.InjectPage;
@@ -49,11 +47,8 @@
public abstract class Report
extends NavigationablePageImpl<ReportPageParameters>
{
- private static final Logger log = Logger.getLogger( Report.class );
+ private static final Logger log = Logger.getLogger( Report.class );
- @Asset( value = "/be/unid/tapestry/pages/Report.script" )
- public abstract IAsset getReportScript();
-
@Bean( UnidFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
@@ -114,26 +109,5 @@
public ReportParameter[] getParameters()
{
return getPageParameters().getReportParameters();
- }
-
- public String getReportSource()
- {
- try
- {
- String providerClassName = ResourceUtil.getConfigString( "report-server-url-provider-class" );
- if ( providerClassName == null ) return "/report/";
- ReportServerURLProvider provider = (ReportServerURLProvider) Thread.currentThread().getContextClassLoader()
- .loadClass( providerClassName ).newInstance();
- if ( provider.getReportURL() != null && provider.getReportURL().length() > 0 )
- {
- return provider.getReportURL();
- }
- return "/report/";
- }
- catch ( Exception e )
- {
- log.error( e, e );
- return "/report/";
- }
- }
+ }
}
Deleted: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ReportServerURLProvider.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ReportServerURLProvider.java 2009-05-07 14:28:34 UTC (rev 3830)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ReportServerURLProvider.java 2009-05-08 12:09:42 UTC (rev 3831)
@@ -1,41 +0,0 @@
-/**
- * This file is part of the Uni-d project.
- * $Id$
- *
- * 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 be.unid.tapestry.util;
-
-/**
- * Returns an url of the Report Server.
- * Can be the address of the server running ReportTool.
- * Can be also the ReportServlet.
- * If not provided (ReportServlet is used by reporting in gui)
- *
- *
- * @author Florin
- * @version $Revision$
- */
-public interface ReportServerURLProvider
-{
- public abstract String getReportURL();
-}
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.html 2009-05-07 14:28:34 UTC (rev 3830)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.html 2009-05-08 12:09:42 UTC (rev 3831)
@@ -1,8 +1,6 @@
<border jwcid="@Border" internationalizedTitle="prop:title">
<span jwcid="keepAlive"/>
- <span jwcid="@Script" scriptAsset="asset:reportScript" location="prop:reportSource"/>
-
<script language="JavaScript" src="ReportScript.js">
</script>
@@ -21,15 +19,15 @@
<span jwcid="@Parameters" source="prop:parameters" messageProperties="ReportList"/>
<input type="button" id="BUTTON_PDF" value="PDF"
- onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('pdf', server); "/>
+ onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('pdf'); "/>
<input type="button" id="BUTTON_XML" value="XML"
- onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('xml', server); "/>
+ onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('xml'); "/>
<input type="button" id="BUTTON_XLS" value="XLS"
- onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('xls', server); "/>
+ onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('xls'); "/>
<input type="button" id="BUTTON_HTML" value="HTML"
- onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('html', server); "/>
+ onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('html'); "/>
<input type="button" id="BUTTON_CSV" value="CSV"
- onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('csv', server); "/>
+ onclick="if (!document.forms[0].onsubmit || document.forms[0].onsubmit()) fillParamsInTextArea('csv'); "/>
</form>
</fieldset>
Deleted: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.script
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.script 2009-05-07 14:28:34 UTC (rev 3830)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/Report.script 2009-05-08 12:09:42 UTC (rev 3831)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE script PUBLIC
- "-//Apache Software Foundation//Tapestry Script Specification 3.0//EN"
- "http://jakarta.apache.org/tapestry/dtd/Script_3_0.dtd">
-<script>
- <input-symbol key="location" class="java.lang.String" required="yes"/>
- <body>
- <unique>
-
- </unique>
- </body>
- <initialization>
- var server = "${location}";
- </initialization>
-</script>
Modified: trunk/Uni-d/template/src/main/webapp/ReportScript.js
===================================================================
--- trunk/Uni-d/template/src/main/webapp/ReportScript.js 2009-05-07 14:28:34 UTC (rev 3830)
+++ trunk/Uni-d/template/src/main/webapp/ReportScript.js 2009-05-08 12:09:42 UTC (rev 3831)
@@ -19,7 +19,7 @@
return value;
}
-function fillParamsInTextArea(type,server)
+function fillParamsInTextArea(type)
{
/* avoid adding the parameters twice */
while (document.forms[1].hasChildNodes())
@@ -83,7 +83,7 @@
parameters=document.createElement("input");
parameters.name="parameters";
document.forms[1].appendChild(parameters);
- document.forms[1].action=server+document.getElementById("filename").value+"_"+document.getElementById("language").value+"."+type;
+ document.forms[1].action="/report/"+document.getElementById("filename").value+"_"+document.getElementById("language").value+"."+type;
for (i=0; i<names.length; i=i+1)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-07 14:28:44
|
Revision: 3830
http://uni-d.svn.sourceforge.net/uni-d/?rev=3830&view=rev
Author: max_brod
Date: 2009-05-07 14:28:34 +0000 (Thu, 07 May 2009)
Log Message:
-----------
[ICT-1514]
Hide-If-class to hide items depending on new field UnidUser.Debug.
Modified Paths:
--------------
trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table
trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfNoDebugUser.java
Modified: trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table
===================================================================
--- trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table 2009-05-07 12:29:09 UTC (rev 3829)
+++ trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table 2009-05-07 14:28:34 UTC (rev 3830)
@@ -30,7 +30,7 @@
<choice name="LANGUAGE_DUTCH" value="nl"/>
<choice name="LANGUAGE_ROMANIAN" value="ro"/>
<choice name="LANGUAGE_PORTUGUESE" value="pt"/>
- <choice name="LANGUAGE_GERMAN" value="de"/>
+ <choice name="LANGUAGE_GERMAN" value="de"/>
</field>
<field name="AccessUserMenu" type="boolean">
@@ -39,6 +39,12 @@
</description>
</field>
+ <field name="Debug" type="boolean">
+ <description>
+ View tables/fields that are normally not needed for normal users?
+ </description>
+ </field>
+
<field name="TablesPreferences" type="UnidRight">
<description>Preferences to view/or not tables</description>
<hide/>
Modified: trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java
===================================================================
--- trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java 2009-05-07 12:29:09 UTC (rev 3829)
+++ trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java 2009-05-07 14:28:34 UTC (rev 3830)
@@ -45,6 +45,7 @@
List<String> roles;
long deadline;
boolean acccessUserMenu;
+ boolean debug;
public LoginInfo(){}
@@ -148,4 +149,14 @@
{
this.acccessUserMenu = acccessUserMenu;
}
+
+ public boolean isDebug()
+ {
+ return debug;
+ }
+
+ public void setDebug( boolean debug )
+ {
+ this.debug = debug;
+ }
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java 2009-05-07 12:29:09 UTC (rev 3829)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java 2009-05-07 14:28:34 UTC (rev 3830)
@@ -167,6 +167,7 @@
info.setUserName( userName );
info.setAdministrator( true );
info.setAcccessUserMenu( true );
+ info.setDebug( true );
}
if ( log.isDebugEnabled() ) log.debug( "jaas hocus pocus" );
@@ -185,6 +186,7 @@
sessionUserAdmin.setPassword( info.getPassword() );
sessionUserAdmin.setUserAdministrator( info.isAdministrator() );
sessionUserAdmin.setAcccessUserMenu( info.isAcccessUserMenu() );
+ sessionUserAdmin.setDebug( info.isDebug() );
Set<SimplePrincipal> roles = jsm.getUserRoles( new SimplePrincipal( info.getUserName() ) );
sessionUserAdmin.setRoles( roles != null ? roles : new ArrayList<SimplePrincipal>() );
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java 2009-05-07 12:29:09 UTC (rev 3829)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java 2009-05-07 14:28:34 UTC (rev 3830)
@@ -30,7 +30,7 @@
private transient boolean userAdministrator; // current user is administrator
private transient Collection<SimplePrincipal> roles;// roles for the logged in user
private transient boolean acccessUserMenu; // is user allowed to see the user preferences menu
-
+ private transient boolean debug; // is user allowed to see the table/fields, not interesting for the normal user?
private transient long lastAccess;
public SessionUserAdmin() { }
@@ -281,4 +281,14 @@
{
this.acccessUserMenu = acccessUserMenu;
}
+
+ public boolean isDebug()
+ {
+ return debug;
+ }
+
+ public void setDebug( boolean debug )
+ {
+ this.debug = debug;
+ }
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java 2009-05-07 12:29:09 UTC (rev 3829)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java 2009-05-07 14:28:34 UTC (rev 3830)
@@ -57,6 +57,7 @@
info.setAdministrator( isAdmin );
info.setLanguage( (String) UnidProxyAccessor.getField( user, "Language" ) );
info.setAcccessUserMenu( (Boolean)UnidProxyAccessor.getField( user, "AccessUserMenu" ) );
+ info.setDebug( (Boolean)UnidProxyAccessor.getField( user, "Debug" ) );
return info;
}
return null;
Added: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfNoDebugUser.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfNoDebugUser.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfNoDebugUser.java 2009-05-07 14:28:34 UTC (rev 3830)
@@ -0,0 +1,40 @@
+/**
+ * This file is part of the Uni-d project.
+ * $Id$
+ *
+ * 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 be.unid.tapestry.validation;
+
+/**
+ * Implementation of HideIf to hide an item if the current user doesn't have "Debug" set
+ *
+ * @author Florin
+ * @version $Revision$
+ */
+public class HideIfNoDebugUser
+ extends HideIfAdapter
+{
+ public boolean isHidden()
+ {
+ return !page.getSessionUserAdmin().isDebug();
+ }
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfNoDebugUser.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-07 12:29:19
|
Revision: 3829
http://uni-d.svn.sourceforge.net/uni-d/?rev=3829&view=rev
Author: max_brod
Date: 2009-05-07 12:29:09 +0000 (Thu, 07 May 2009)
Log Message:
-----------
[ICT-1514]
Moved the HideIf interface into the tapestry package.
Added function setPage, to be able to have implementations that can access tapestry/session/useradmin stuff.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidField/UnidField2.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidTable/UnidTable.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/actionRights/ActionRights.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/selectRights/SelectRights.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/fullTextSearch/FullTextSearchPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesCategoryIndex/TablesCategoryIndex.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesIndex/TablesIndexPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminTablesConfig/AdminTablesConfig.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java
trunk/Uni-d/test/src/main/be/unid/test/validator/ItemDisplayer.java
trunk/Uni-d/test/src/main/be/unid/test/validator/ItemHiddener.java
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIf.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAdapter.java
Removed Paths:
-------------
trunk/Uni-d/server/src/main/java/be/unid/validation/HideIf.java
trunk/Uni-d/server/src/main/java/be/unid/validation/HideIfAdapter.java
Deleted: trunk/Uni-d/server/src/main/java/be/unid/validation/HideIf.java
===================================================================
--- trunk/Uni-d/server/src/main/java/be/unid/validation/HideIf.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/server/src/main/java/be/unid/validation/HideIf.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -1,40 +0,0 @@
-/**
- * This file is part of the Uni-d project.
- * $Id$
- *
- * 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 be.unid.validation;
-
-/**
- * Interface which needs to be implemented for the hide-if classes
- * (These are used in GUI, to hide tables, fields etc. depending on some conditions at runtime).
- *
- * @author Florin
- * @version $Revision$
- */
-public interface HideIf
-{
- public void setParameters( String parameters );
-
- public boolean isHidden();
-}
Deleted: trunk/Uni-d/server/src/main/java/be/unid/validation/HideIfAdapter.java
===================================================================
--- trunk/Uni-d/server/src/main/java/be/unid/validation/HideIfAdapter.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/server/src/main/java/be/unid/validation/HideIfAdapter.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -1,40 +0,0 @@
-/**
- * This file is part of the Uni-d project.
- * $Id$
- *
- * 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 be.unid.validation;
-
-/**
- * Adapter class for HideIf, extend and overwrite for the desired behaviour.
- *
- * @author Florin
- * @version $Revision$
- */
-public class HideIfAdapter
- implements HideIf
-{
- public void setParameters( String parameters ) {}
-
- public boolean isHidden() { return false;}
-}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -37,8 +37,8 @@
import be.unid.tapestry.parser.border.BorderItemTranslator;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.pool.Pool;
+import be.unid.tapestry.validation.HideIf;
import be.unid.validation.SimpleValidator;
-import be.unid.validation.HideIf;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.ComponentClass;
@@ -199,10 +199,10 @@
if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "tc" + category ) ) continue;
if ( !getSessionUserAdmin().hasAccess( "tc" + category, AccessRight.TABLE_PREFERENCE_DISPLAY ) ) continue;
ArrayList<String> tables = categories.get( category );
- String categoryLabel=getMessages().getMessage( "category." + category + ".label" );
+ String categoryLabel = getMessages().getMessage( "category." + category + ".label" );
categoryLabel = categoryLabel.replace( "\'", "'" );
- ArrayWrapper calculatedCategory = new ArrayWrapper(categoryLabel , category, true );
+ ArrayWrapper calculatedCategory = new ArrayWrapper( categoryLabel, category, true );
ArrayList<String[]> calculatedTables = new ArrayList<String[]>();
for ( String table : tables )
{
@@ -215,8 +215,9 @@
{
if ( gmTable.getHideIfParameters() != null )
{
- ( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
+ ( (be.unid.tapestry.validation.HideIf) o ).setParameters( gmTable.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -31,11 +31,12 @@
import be.unid.tapestry.pages.action.ActionPage;
import be.unid.tapestry.pages.select.SelectPage;
import be.unid.tapestry.pages.shared.AddViewEditPageParameters;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.util.DisplayMode;
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.pool.Pool;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Component;
@@ -122,6 +123,7 @@
{
( (HideIf) o ).setParameters( action.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
@@ -187,6 +189,6 @@
public boolean isRecordBrowserShown()
{
- return getTableDescription().hasReferenceField() && !(getPage() instanceof SelectPage);
+ return getTableDescription().hasReferenceField() && !( getPage() instanceof SelectPage );
}
}
\ No newline at end of file
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidField/UnidField2.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidField/UnidField2.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidField/UnidField2.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -32,10 +32,9 @@
import be.unid.tapestry.components.input.unidInputBlock.UnidInputBlock;
import be.unid.tapestry.model.GMField;
import be.unid.tapestry.util.DisplayMode;
-import be.unid.tapestry.navigation.NavigationablePage;
import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.pool.Pool;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.annotations.Asset;
@@ -108,8 +107,10 @@
{
if ( getFieldDescription().getHideIfParameters() != null )
{
- ( (HideIf) o ).setParameters( getFieldDescription().getHideIfParameters() );
+ ( (be.unid.tapestry.validation.HideIf) o )
+ .setParameters( getFieldDescription().getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) return false;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -29,7 +29,8 @@
import be.unid.tapestry.components.unidField.UnidField2;
import be.unid.tapestry.model.GMGroup;
import be.unid.tapestry.pool.Pool;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
+import be.unid.tapestry.pages.UnidBasePage;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Component;
@@ -250,6 +251,7 @@
{
( (HideIf) o ).setParameters( group.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) return false;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidTable/UnidTable.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidTable/UnidTable.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidTable/UnidTable.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -37,8 +37,9 @@
import be.unid.tapestry.selectionModel.TableTypeSelectionModel;
import be.unid.tapestry.util.DisplayMode;
import be.unid.tapestry.pool.Pool;
+import be.unid.tapestry.validation.HideIf;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.validation.DefaultInstance;
-import be.unid.validation.HideIf;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Component;
@@ -238,8 +239,9 @@
{
if ( page.getHideIfParameters() != null )
{
- ( (HideIf) o ).setParameters( page.getHideIfParameters() );
+ ( (be.unid.tapestry.validation.HideIf) o ).setParameters( page.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/actionRights/ActionRights.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/actionRights/ActionRights.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/actionRights/ActionRights.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -31,7 +31,8 @@
import be.unid.tapestry.selectionModel.RunnableRightsSelectionModel;
import be.unid.tapestry.pool.Pool;
import be.unid.validation.RunnableRights;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
+import be.unid.tapestry.pages.UnidBasePage;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Component;
@@ -113,6 +114,7 @@
{
( (HideIf) o ).setParameters( action.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/selectRights/SelectRights.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/selectRights/SelectRights.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/table/selectRights/SelectRights.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -31,7 +31,8 @@
import be.unid.tapestry.selectionModel.RunnableRightsSelectionModel;
import be.unid.tapestry.pool.Pool;
import be.unid.validation.RunnableRights;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
+import be.unid.tapestry.pages.UnidBasePage;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Component;
@@ -100,6 +101,7 @@
{
( (HideIf) o ).setParameters( sel.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/fullTextSearch/FullTextSearchPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/fullTextSearch/FullTextSearchPage.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/fullTextSearch/FullTextSearchPage.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -27,7 +27,6 @@
import be.unid.tapestry.navigation.NavigationablePageImpl;
import be.unid.tapestry.util.UnidFormValidator;
import be.unid.tapestry.util.UnidProxyAccessor;
-import be.unid.tapestry.util.Global;
import be.unid.tapestry.util.FieldType;
import be.unid.tapestry.components.shared.DescriptionFactory;
import be.unid.tapestry.model.GMTable;
@@ -35,11 +34,11 @@
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.pages.view.ViewPage;
-import be.unid.tapestry.translator.UnidIntTranslator;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.translator.TranslatorFactory;
+import be.unid.tapestry.validation.HideIf;
import be.unid.persistence.om.UnidProxy;
import be.unid.persistence.om.SelectorsState;
-import be.unid.validation.HideIf;
import org.apache.log4j.Logger;
import org.apache.tapestry.annotations.Bean;
import org.apache.tapestry.annotations.Component;
@@ -170,6 +169,7 @@
{
( (HideIf) o ).setParameters( table.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
@@ -342,6 +342,7 @@
{
( (HideIf) o ).setParameters( table.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -32,11 +32,12 @@
import be.unid.tapestry.navigation.UserAdminConfigurablePage;
import be.unid.tapestry.pages.add.AddPage;
import be.unid.tapestry.pages.select.SelectPage;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.pool.Pool;
import be.unid.persistence.om.SelectorsState;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.components.ForBean;
@@ -101,8 +102,9 @@
{
if ( select.getHideIfParameters() != null )
{
- ( (HideIf) o ).setParameters( select.getHideIfParameters() );
+ ( (be.unid.tapestry.validation.HideIf) o ).setParameters( select.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesCategoryIndex/TablesCategoryIndex.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesCategoryIndex/TablesCategoryIndex.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesCategoryIndex/TablesCategoryIndex.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -28,11 +28,12 @@
import be.unid.tapestry.components.shared.DescriptionFactory;
import be.unid.tapestry.navigation.NavigationablePageImpl;
import be.unid.tapestry.pages.tableManager.TableManagerPage;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.components.ForBean;
@@ -82,6 +83,7 @@
{
( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesIndex/TablesIndexPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesIndex/TablesIndexPage.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tablesIndex/TablesIndexPage.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -28,11 +28,12 @@
import be.unid.tapestry.components.shared.DescriptionFactory;
import be.unid.tapestry.navigation.NavigationablePageImpl;
import be.unid.tapestry.pages.tableManager.TableManagerPage;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.components.ForBean;
@@ -81,6 +82,7 @@
{
( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -34,12 +34,13 @@
import be.unid.tapestry.pages.userAdmin.tableRightsPage.TableRightsPage;
import be.unid.tapestry.pages.add.AddPage;
import be.unid.tapestry.pages.edit.EditPage;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.util.UnidProxyAccessor;
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.parser.border.Parser;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import be.unid.validation.SimpleValidator;
import be.unid.persistence.om.UnidProxy;
import org.apache.tapestry.IRequestCycle;
@@ -86,6 +87,7 @@
{
( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminTablesConfig/AdminTablesConfig.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminTablesConfig/AdminTablesConfig.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminTablesConfig/AdminTablesConfig.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -30,7 +30,8 @@
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
+import be.unid.tapestry.pages.UnidBasePage;
import org.apache.tapestry.form.IPropertySelectionModel;
import java.util.ArrayList;
@@ -67,6 +68,7 @@
{
( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -32,12 +32,13 @@
import be.unid.tapestry.pages.userAdmin.userBorderConfig.UserBorderConfig;
import be.unid.tapestry.pages.userAdmin.userReportsConfig.UserReportsConfig;
import be.unid.tapestry.pages.userAdmin.userTablesConfig.UserTablesConfig;
+import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.util.TranslationComparator;
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.parser.border.Parser;
-import be.unid.validation.HideIf;
+import be.unid.tapestry.validation.HideIf;
import be.unid.validation.SimpleValidator;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.annotations.Component;
@@ -83,6 +84,7 @@
{
( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
}
+ ( (HideIf) o ).setPage( (UnidBasePage) this.getPage() );
if ( ( (HideIf) o ).isHidden() ) continue;
}
}
Copied: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIf.java (from rev 3826, trunk/Uni-d/server/src/main/java/be/unid/validation/HideIf.java)
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIf.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIf.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -0,0 +1,44 @@
+/**
+ * This file is part of the Uni-d project.
+ * $Id$
+ *
+ * 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 be.unid.tapestry.validation;
+
+import be.unid.tapestry.pages.UnidBasePage;
+
+/**
+ * Interface which needs to be implemented for the hide-if classes
+ * (These are used in GUI, to hide tables, fields etc. depending on some conditions at runtime).
+ *
+ * @author Florin
+ * @version $Revision$
+ */
+public interface HideIf
+{
+ public void setParameters( String parameters );
+
+ public void setPage( UnidBasePage page );
+
+ public boolean isHidden();
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIf.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Copied: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAdapter.java (from rev 3826, trunk/Uni-d/server/src/main/java/be/unid/validation/HideIfAdapter.java)
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAdapter.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAdapter.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -0,0 +1,49 @@
+/**
+ * This file is part of the Uni-d project.
+ * $Id$
+ *
+ * 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 be.unid.tapestry.validation;
+
+import be.unid.tapestry.pages.UnidBasePage;
+
+/**
+ * Adapter class for HideIf, extend and overwrite for the desired behaviour.
+ *
+ * @author Florin
+ * @version $Revision$
+ */
+public class HideIfAdapter
+ implements HideIf
+{
+ UnidBasePage page;
+
+ public void setPage( UnidBasePage page )
+ {
+ this.page = page;
+ }
+
+ public void setParameters( String parameters ) {}
+
+ public boolean isHidden() { return false;}
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/validation/HideIfAdapter.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/Uni-d/test/src/main/be/unid/test/validator/ItemDisplayer.java
===================================================================
--- trunk/Uni-d/test/src/main/be/unid/test/validator/ItemDisplayer.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/test/src/main/be/unid/test/validator/ItemDisplayer.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -29,7 +29,7 @@
package be.unid.test.validator;
-import be.unid.validation.HideIfAdapter;
+import be.unid.tapestry.validation.HideIfAdapter;
/**
* Implementation of HideIf, to always show items.
Modified: trunk/Uni-d/test/src/main/be/unid/test/validator/ItemHiddener.java
===================================================================
--- trunk/Uni-d/test/src/main/be/unid/test/validator/ItemHiddener.java 2009-05-06 16:28:42 UTC (rev 3828)
+++ trunk/Uni-d/test/src/main/be/unid/test/validator/ItemHiddener.java 2009-05-07 12:29:09 UTC (rev 3829)
@@ -29,8 +29,6 @@
package be.unid.test.validator;
-import be.unid.validation.HideIfAdapter;
-
/**
* Implementation of HideIf, to always hide items.
*
@@ -38,7 +36,7 @@
* @version $Revision$
*/
-public class ItemHiddener extends HideIfAdapter
+public class ItemHiddener extends be.unid.tapestry.validation.HideIfAdapter
{
@Override
public boolean isHidden()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-06 16:28:56
|
Revision: 3828
http://uni-d.svn.sourceforge.net/uni-d/?rev=3828&view=rev
Author: max_brod
Date: 2009-05-06 16:28:42 +0000 (Wed, 06 May 2009)
Log Message:
-----------
When searching for XXX? (description part), don't cut more than the "?".
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java 2009-05-06 12:32:47 UTC (rev 3827)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java 2009-05-06 16:28:42 UTC (rev 3828)
@@ -313,7 +313,7 @@
String value = "";
if ( preparedStatement.inputBox.length() > 1 )
{
- value = preparedStatement.inputBox.substring( 0, preparedStatement.inputBox.length() - 2 );
+ value = preparedStatement.inputBox.substring( 0, preparedStatement.inputBox.length() - 1 );
}
searchBy( component, selectName, fieldName, FieldType.TYPE_STRING, value );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-06 12:32:57
|
Revision: 3827
http://uni-d.svn.sourceforge.net/uni-d/?rev=3827&view=rev
Author: max_brod
Date: 2009-05-06 12:32:47 +0000 (Wed, 06 May 2009)
Log Message:
-----------
Replace ' in category names too.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-05-06 07:53:15 UTC (rev 3826)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-05-06 12:32:47 UTC (rev 3827)
@@ -199,8 +199,10 @@
if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "tc" + category ) ) continue;
if ( !getSessionUserAdmin().hasAccess( "tc" + category, AccessRight.TABLE_PREFERENCE_DISPLAY ) ) continue;
ArrayList<String> tables = categories.get( category );
- ArrayWrapper calculatedCategory =
- new ArrayWrapper( getMessages().getMessage( "category." + category + ".label" ), category, true );
+ String categoryLabel=getMessages().getMessage( "category." + category + ".label" );
+ categoryLabel = categoryLabel.replace( "\'", "'" );
+
+ ArrayWrapper calculatedCategory = new ArrayWrapper(categoryLabel , category, true );
ArrayList<String[]> calculatedTables = new ArrayList<String[]>();
for ( String table : tables )
{
@@ -223,9 +225,9 @@
{
continue;
}
- String label = getMessages().getMessage( "table." + table + ".label" );
- label = label.replace( "\'", "'" );
- calculatedTables.add( new String[]{ label, table, gmTable.getDisplayIndex() } );
+ String tableLabel = getMessages().getMessage( "table." + table + ".label" );
+ tableLabel = tableLabel.replace( "\'", "'" );
+ calculatedTables.add( new String[]{ tableLabel, table, gmTable.getDisplayIndex() } );
}
Collections.sort( calculatedTables, translatedItemComparator );
calculatedTableCategories.put( calculatedCategory, calculatedTables );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-05-06 07:53:39
|
Revision: 3826
http://uni-d.svn.sourceforge.net/uni-d/?rev=3826&view=rev
Author: pushkutza
Date: 2009-05-06 07:53:15 +0000 (Wed, 06 May 2009)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-04 11:19:47 UTC (rev 3825)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-05-06 07:53:15 UTC (rev 3826)
@@ -79,7 +79,7 @@
<input jwcid="unidComboboxLinkField" class="displayInline" onchange="prop:changeComboboxSelection"/>
<span jwcid="@If" condition="prop:notHiddenAnchors">
- <span jwcid="@LinkSubmit" onclick="clearValidation(this);" class="displayInline"
+ <span jwcid="@LinkSubmit" onclick="clearValidation(this);" class="addLinkClass displayInline"
listener="listener:prepareReturnHandler" action="listener:runAdd" id="prop:addId">
<span key="Add"/>
</span>
@@ -88,7 +88,7 @@
</span>
<span jwcid="@If" condition="prop:notHiddenAnchors">
- <span jwcid="display@LinkSubmit" onclick="clearValidation(this);" class="displayInline"
+ <span jwcid="display@LinkSubmit" onclick="clearValidation(this);" class="viewLinkClass displayInline"
listener="listener:prepareReturnHandler" action="listener:runView" id="prop:viewId">
<span jwcid="@If" condition="prop:comboboxOrEmbedded">
<span jwcid="@If" condition="prop:valueSet"><span key="View"/></span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-04 11:19:54
|
Revision: 3825
http://uni-d.svn.sourceforge.net/uni-d/?rev=3825&view=rev
Author: max_brod
Date: 2009-05-04 11:19:47 +0000 (Mon, 04 May 2009)
Log Message:
-----------
[UNI-462]
Finished page to edit/show content of multiple link fields.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageParams.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageReturnHandler.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/multipleField/MultipleFieldPage.html
trunk/Uni-d/template/src/main/webapp/translations-common.txt
trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.java 2009-05-04 11:19:47 UTC (rev 3825)
@@ -29,9 +29,11 @@
import be.unid.tapestry.binder.MultipleFieldBinderSource;
import be.unid.tapestry.components.input.DescriptionInputContainerImpl;
import be.unid.tapestry.components.shared.DescriptionFactory;
+import be.unid.tapestry.components.shared.ConfigurationKeys;
import be.unid.tapestry.util.DisplayMode;
import be.unid.tapestry.util.UnidProxyAccessor;
import be.unid.tapestry.util.FieldType;
+import be.unid.tapestry.util.ResourceUtil;
import be.unid.tapestry.pages.add.AddPage;
import be.unid.tapestry.pages.multipleField.MultipleFieldPage;
import be.unid.tapestry.pages.multipleField.MultipleFieldPageReturnHandler;
@@ -266,10 +268,9 @@
public boolean isShownFully()
{
- if (true) return true;
if ( FieldType.TYPE_LINK != getFieldDescription().getFieldType() ) return true;
if ( getFieldDescription().getReferenceField() == null ) return true;
- if ( getValues().size() < 25 ) return true;
+ if ( getValues().size() < ResourceUtil.getConfigInt( ConfigurationKeys.MAX_MULTIPLE_FIELDS_RECORDS_IN_PAGE) ) return true;
return false;
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-05-04 11:19:47 UTC (rev 3825)
@@ -69,7 +69,7 @@
import java.util.List;
/**
- * Component to display the results of a select.
+ * Component to display the results of a select (using the selectObject parameter) or from a calculated list (via directValues).
*
* @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
* @version $Revision$
@@ -87,6 +87,8 @@
@Parameter( name = "directValues" )
public abstract List<UnidProxy> getDirectValues();
+ public abstract void setDirectValues( List<UnidProxy> values );
+
@Parameter( name = "table" )
public abstract GMTable getTable();
@@ -246,7 +248,7 @@
if ( !iRequestCycle.isRewinding() && isAutoRunSelect() )
{
find( getDisplayedPageNumber() );
- }
+ }
super.renderComponent( iMarkupWriter, iRequestCycle );
}
@@ -357,7 +359,16 @@
if ( log.isDebugEnabled() ) log.debug( "UnidSelectResults.remove - remove proxy uoid = " + uoid );
try
{
- UnidProxyAccessor.findUoid( getTableName(), uoid ).removeEntityBean();
+ if ( getDirectValues() != null )
+ {
+ List<UnidProxy> values = getDirectValues();
+ values.remove( UnidProxyAccessor.findUoid( getTableName(), uoid ) );
+ setDirectValues( values );
+ }
+ else
+ {
+ UnidProxyAccessor.findUoid( getTableName(), uoid ).removeEntityBean();
+ }
}
catch ( UnidPersistenceException upe )
{
@@ -783,7 +794,7 @@
{
displayedFields.add( new FakeGmField( FakeGmField.Type.VIEW ) );
displayedFields.add( new FakeGmField( FakeGmField.Type.EDIT ) );
- if ( getSessionUserAdmin().isTableRemoveable( tableDesc ) )
+ if ( getDirectValues() != null || getSessionUserAdmin().isTableRemoveable( tableDesc ) )
{
displayedFields.add( new FakeGmField( FakeGmField.Type.REMOVE ) );
}
@@ -805,6 +816,11 @@
}
return false;
}
+
+ public boolean isShowReports()
+ {
+ return getDirectValues() == null;
+ }
}
class FakeGmField
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-05-04 11:19:47 UTC (rev 3825)
@@ -45,4 +45,5 @@
public static final String LOGO_FILE = "logo-file";
public static final String MAX_ALERTS = "max-alerts";
public static final String ALERTS_SHOW_WARNINGS = "alerts-show-warnings";
+ public static final String MAX_MULTIPLE_FIELDS_RECORDS_IN_PAGE = "max-multiple-field-records-in-page";
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPage.java 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPage.java 2009-05-04 11:19:47 UTC (rev 3825)
@@ -132,13 +132,26 @@
}
}
+ public void setValues (Collection c)
+ {
+ try
+ {
+ UnidProxyAccessor.setField( getPageParameters().getMainRecordProxy(),
+ getPageParameters().getFieldDescription().getName(), Collection.class, c);
+ }
+ catch (Exception e)
+ {
+ log.error(e, e);
+ }
+ }
+
@Component( type = "UnidSelectResults", id = "selectResults",
bindings = {
// "selectObject = selectObject",
// "selectDescription = selectDescription",
- "directValues =getValues()",
- "table =getTable()",
- "pageSize = 25",
+ "directValues =values",
+ "table =table",
+ "pageSize = PageParameters.pageSize",
"autoRunSelect = PageParameters.autoRunSelect",
"displayedPageNumber = PageParameters.displayedPageNumber" }
)
@@ -166,14 +179,17 @@
try
{
Object value = UnidProxyAccessor.getField( getPageParameters().getProxy(), table.getReferenceField() );
- System.err.println("Adding "+getPageParameters().getProxy());
- System.err.println("Adding 2 "+value);
List<UnidProxy> results = UnidProxyAccessor
.find( table.getName(), "UnidFind" + table.getReferenceField(), new Class[]{ String.class },
new Object[]{ value } );
- if ( results.size() > 0 ) getValues().add( results.get( 0 ) );
+ Collection values=getValues();
+ if ( results.size() > 0 )
+ {
+ values.add(results.get(0));
+ setValues(values);
+ }
}
catch ( Exception e )
{
@@ -186,9 +202,14 @@
bindings = {
"proxy = getPageParameters().getProxy()",
"fieldDescription = getReferenceFieldDescription()",
- "displayMode = displayMode" } )
+ "displayMode = displayModeAdd" } )
public abstract UnidSingleField getFieldToAdd();
+ public DisplayMode getDisplayModeAdd()
+ {
+ return DisplayMode.ADD;
+ }
+
public GMField getReferenceFieldDescription()
{
GMTable table =
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageParams.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageParams.java 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageParams.java 2009-05-04 11:19:47 UTC (rev 3825)
@@ -27,9 +27,12 @@
import be.unid.tapestry.navigation.PageParametersImpl;
import be.unid.tapestry.navigation.HasSelectParameter;
import be.unid.tapestry.navigation.HasProxyParameter;
+import be.unid.tapestry.navigation.PageParameters;
import be.unid.tapestry.model.GMField;
import be.unid.tapestry.util.DisplayMode;
import be.unid.tapestry.util.UnidProxyAccessor;
+import be.unid.tapestry.util.ResourceUtil;
+import static be.unid.tapestry.components.shared.ConfigurationKeys.GUI_SELECT_PAGE_SIZE;
import be.unid.persistence.om.UnidProxy;
/**
@@ -46,7 +49,6 @@
private UnidProxy mainRecordProxy; // main record (the one containing a multiple link)
private DisplayMode displayMode;
private int displayedPageNumber;
- private boolean autoRunSelect;
private UnidProxy proxy; // used by the UnidSelectResults component
public UnidProxy getProxy()
@@ -120,11 +122,17 @@
public boolean isAutoRunSelect()
{
- return autoRunSelect;
+ return true;
}
- public void setAutoRunSelect( boolean autoRunSelect )
+ public void setAutoRunSelect( boolean autoRunSelect ) {}
+
+ public int getPageSize()
{
- this.autoRunSelect = autoRunSelect;
+ return ResourceUtil.getConfigInt( GUI_SELECT_PAGE_SIZE );
}
+
+ public void setPageSize( int pageSize ) {}
+
+
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageReturnHandler.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageReturnHandler.java 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/multipleField/MultipleFieldPageReturnHandler.java 2009-05-04 11:19:47 UTC (rev 3825)
@@ -56,13 +56,13 @@
if ( receivedParams instanceof MultipleFieldPageParams )
{
- UnidProxy proxyReceived = ( (MultipleFieldPageParams) receivedParams ).getProxy();
+ UnidProxy proxyReceived = ( (MultipleFieldPageParams) receivedParams ).getMainRecordProxy();
String fieldName = ( (MultipleFieldPageParams) receivedParams ).getFieldDescription().getName();
try
{
Collection c = (Collection) UnidProxyAccessor.getField( proxyReceived, fieldName );
- UnidProxy proxy=((ProxyBinderSource)binder.getSource()).getProxy();
- UnidProxyAccessor.setField( proxy, fieldName, Collection.class, c);
+ UnidProxy proxy = ( (ProxyBinderSource) binder.getSource() ).getProxy();
+ UnidProxyAccessor.setField( proxy, fieldName, Collection.class, c );
}
catch ( Exception e )
{
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html 2009-05-04 11:19:47 UTC (rev 3825)
@@ -167,15 +167,17 @@
</span>
</tbody>
</table>
- <center>
- <a jwcid="@NavigationLink" listener="listener:printReportPortrait" id="LINK_PRINT_PORTRAIT">
- <span jwcid="@Insert" value="message:PrintPortrait"/>
- </a>
-
- <a jwcid="@NavigationLink" listener="listener:printReportLandscape" id="LINK_PRINT_LANDSCAPE">
- <span jwcid="@Insert" value="message:PrintLandscape"/>
- </a>
- </center>
+ <span jwcid="@If" condition="prop:showReports">
+ <center>
+ <a jwcid="@NavigationLink" listener="listener:printReportPortrait" id="LINK_PRINT_PORTRAIT">
+ <span jwcid="@Insert" value="message:PrintPortrait"/>
+ </a>
+
+ <a jwcid="@NavigationLink" listener="listener:printReportLandscape" id="LINK_PRINT_LANDSCAPE">
+ <span jwcid="@Insert" value="message:PrintLandscape"/>
+ </a>
+ </center>
+ </span>
</fieldset>
</span>
</span>
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/multipleField/MultipleFieldPage.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/multipleField/MultipleFieldPage.html 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/multipleField/MultipleFieldPage.html 2009-05-04 11:19:47 UTC (rev 3825)
@@ -35,24 +35,25 @@
<border jwcid="@Border" title="prop:title">
+
<span jwcid="keepAlive"/>
<span class="displayError" jwcid="@Insert" value="prop:error"/>
+
+ <span jwcid="@If" condition="prop:havingRecords">
+ <span jwcid="selectResults"/>
+ <br/>
+ </span>
+
<form jwcid="@Form" delegate="bean:validationDelegate"
clientValidationEnabled="literal:true"
enctype="multipart/form-data" focus="literal:false">
- <span jwcid="@If" condition="prop:editable">
- <span jwcid="fieldToAdd"/>
- <input jwcid="@Submit" value="message:Add" action="listener:add"/>
- </span>
- <br/>
- <span jwcid="@If" condition="prop:havingRecords">
- <span jwcid="selectResults"/>
- </span>
- <br/>
<span jwcid="@If" condition="prop:editable">
- <input jwcid="@Submit" value="message:Remove" action="listener:remove"/>
+ <fieldset>
+ <span jwcid="fieldToAdd"/>
+ <input jwcid="@Submit" value="message:Add" action="listener:add"/>
+ </fieldset>
</span>
<input jwcid="@Submit" value="message:Back" action="listener:back"/>
Modified: trunk/Uni-d/template/src/main/webapp/translations-common.txt
===================================================================
--- trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-05-04 11:19:47 UTC (rev 3825)
@@ -1074,5 +1074,10 @@
.label.nl D
.label.ro D
.label.fr D
+.key ShowMultipleFieldDetails/Uni-d-fixed
+.label.en Details
+.label.nl Details
+.label.ro Detalii
+.label.fr Details
Modified: trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties
===================================================================
--- trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties 2009-04-30 17:04:22 UTC (rev 3824)
+++ trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties 2009-05-04 11:19:47 UTC (rev 3825)
@@ -11,3 +11,4 @@
max-alerts=20
alerts-show-warnings=true
;configure-border-extra-class=XXX
+max-multiple-field-records-in-page=3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-30 17:04:44
|
Revision: 3824
http://uni-d.svn.sourceforge.net/uni-d/?rev=3824&view=rev
Author: pushkutza
Date: 2009-04-30 17:04:22 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
ICT-1584
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-04-30 12:16:56 UTC (rev 3823)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-04-30 17:04:22 UTC (rev 3824)
@@ -56,7 +56,7 @@
<input jwcid="unidUoid" class="displayNone"/>
</span>
- <input jwcid="inputBox" class="displayInline"
+ <input jwcid="inputBox" class="linkInput displayInline"
onfocus="inputBoxOnFocus(this)" onblur="prop:inputBoxBlur"/>
<span jwcid="@contrib:XTile" receiveName="ajaxLinkReceiveResponse" sendName="ajaxLinkSendRequest"
listener="listener:ajaxLinkHandler"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-04-30 12:18:08
|
Revision: 3823
http://uni-d.svn.sourceforge.net/uni-d/?rev=3823&view=rev
Author: max_brod
Date: 2009-04-30 12:16:56 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Remove useless logging.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-04-30 12:00:52 UTC (rev 3822)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-04-30 12:16:56 UTC (rev 3823)
@@ -259,8 +259,6 @@
{
// runs select
- System.err.println("finding...");
-
List<UnidProxy> allList;
if ( getDirectValues() != null )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-04-30 12:01:18
|
Revision: 3822
http://uni-d.svn.sourceforge.net/uni-d/?rev=3822&view=rev
Author: max_brod
Date: 2009-04-30 12:00:52 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
[ICT-1579]
Don't show the first/previous/next/last arrows in select pages with just one record.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/navigation/recordBrowser/RecordBrowser.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidView/UnidView.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/navigation/recordBrowser/RecordBrowser.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/navigation/recordBrowser/RecordBrowser.java 2009-04-30 08:07:50 UTC (rev 3821)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/navigation/recordBrowser/RecordBrowser.java 2009-04-30 12:00:52 UTC (rev 3822)
@@ -86,7 +86,6 @@
private void navigate( Direction direction )
{
- log.error( "navigating " + direction );
if ( getDisplayMode().equals( DisplayMode.EDIT ) )
{
try
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-04-30 08:07:50 UTC (rev 3821)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-04-30 12:00:52 UTC (rev 3822)
@@ -221,7 +221,7 @@
@Component( type = "UnidView", id = "unidView",
bindings = {
"tableDescription = getCalculatedTable()",
- "proxy = getPage().getPageParameters().getProxy()" } )
+ "proxy = getPage().getPageParameters().proxy" } )
public abstract UnidView getUnidViewComponent();
public GMTable getCalculatedTable()
@@ -259,6 +259,8 @@
{
// runs select
+ System.err.println("finding...");
+
List<UnidProxy> allList;
if ( getDirectValues() != null )
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java 2009-04-30 08:07:50 UTC (rev 3821)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidEdit/UnidEdit.java 2009-04-30 12:00:52 UTC (rev 3822)
@@ -187,6 +187,6 @@
public boolean isRecordBrowserShown()
{
- return getTableDescription().hasReferenceField();
+ return getTableDescription().hasReferenceField() && !(getPage() instanceof SelectPage);
}
}
\ No newline at end of file
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidView/UnidView.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidView/UnidView.java 2009-04-30 08:07:50 UTC (rev 3821)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidView/UnidView.java 2009-04-30 12:00:52 UTC (rev 3822)
@@ -28,6 +28,7 @@
import be.unid.tapestry.components.shared.AddViewEditCommons;
import be.unid.tapestry.util.DisplayMode;
import be.unid.tapestry.pages.shared.AddViewEditPageParameters;
+import be.unid.tapestry.pages.select.SelectPage;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.ComponentClass;
@@ -65,6 +66,6 @@
public boolean isRecordBrowserShown()
{
- return getTableDescription().hasReferenceField();
+ return getTableDescription().hasReferenceField() && !(getPage() instanceof SelectPage );
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-04-30 08:07:54
|
Revision: 3821
http://uni-d.svn.sourceforge.net/uni-d/?rev=3821&view=rev
Author: max_brod
Date: 2009-04-30 08:07:50 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Make it possible to make fields auto dynamically.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java 2009-04-29 15:40:37 UTC (rev 3820)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java 2009-04-30 08:07:50 UTC (rev 3821)
@@ -263,6 +263,11 @@
return auto;
}
+ public void setAuto( boolean auto )
+ {
+ this.auto = auto;
+ }
+
public boolean isCalculated()
{
return calculated;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-29 15:40:48
|
Revision: 3820
http://uni-d.svn.sourceforge.net/uni-d/?rev=3820&view=rev
Author: pushkutza
Date: 2009-04-29 15:40:37 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
ICT-1572
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-29 15:28:44 UTC (rev 3819)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-29 15:40:37 UTC (rev 3820)
@@ -116,7 +116,7 @@
return i;
}
- public static ConfigureBorderExtraProvider extraBorderProvider;
+ public static ConfigureBorderExtraProvider extraBorderProvider = null;
private ConfigureBorderExtraProvider getConfigureBorderExtraClass()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-29 15:28:53
|
Revision: 3819
http://uni-d.svn.sourceforge.net/uni-d/?rev=3819&view=rev
Author: pushkutza
Date: 2009-04-29 15:28:44 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
ICT-1572
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ConfigureBorderExtraProvider.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-04-29 14:53:22 UTC (rev 3818)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-04-29 15:28:44 UTC (rev 3819)
@@ -40,6 +40,7 @@
public static final String LOGOFF_TIMEOUT_CLASS = "logoff-timeout-class";
public static final String LOGIN_INIT_CLASS = "login-init-class";
public static final String LOGIN_IMAGE_PATH = "login-image-path";
+ public static final String CONFIGURE_BORDER_EXTRA_CLASS = "configure-border-extra-class";
public static final String FINDER_LIMIT = "finder-limit";
public static final String LOGO_FILE = "logo-file";
public static final String MAX_ALERTS = "max-alerts";
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-29 14:53:22 UTC (rev 3818)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-29 15:28:44 UTC (rev 3819)
@@ -30,7 +30,10 @@
import be.unid.tapestry.parser.border.ItemDescriptionEx;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.components.shared.DescriptionFactory;
+import be.unid.tapestry.components.shared.ConfigurationKeys;
import be.unid.tapestry.rights.AccessRight;
+import be.unid.tapestry.util.ResourceUtil;
+import be.unid.tapestry.util.ConfigureBorderExtraProvider;
import be.unid.validation.SimpleValidator;
import java.util.*;
@@ -38,6 +41,7 @@
import org.apache.tapestry.form.IPropertySelectionModel;
import org.apache.tapestry.IEngine;
import org.apache.tapestry.IRequestCycle;
+import org.apache.log4j.Logger;
/**
* Page to configure visibility of border items, for any role
@@ -48,6 +52,7 @@
public abstract class AdminBorderConfig
extends NavigationablePageImpl
{
+ protected static final Logger log = Logger.getLogger( AdminBorderConfig.class );
private void addNames( Parser.ItemDescription item, ArrayList<String> names )
{
@@ -111,6 +116,35 @@
return i;
}
+ public static ConfigureBorderExtraProvider extraBorderProvider;
+
+ private ConfigureBorderExtraProvider getConfigureBorderExtraClass()
+ {
+ if ( extraBorderProvider == null )
+ {
+ try
+ {
+ Object initclass =
+ Pool.getClass( ResourceUtil.getConfigString( ConfigurationKeys.CONFIGURE_BORDER_EXTRA_CLASS ) );
+ if ( initclass != null )
+ {
+ if ( initclass instanceof ConfigureBorderExtraProvider )
+ {
+ extraBorderProvider = ( (ConfigureBorderExtraProvider) initclass );
+ }
+ else
+ {
+ log.error(
+ "Class '" + ResourceUtil.getConfigString( ConfigurationKeys.CONFIGURE_BORDER_EXTRA_CLASS ) +
+ "' does not implement be.unid.tapestry.util.ConfigureBorderExtraProvider!" );
+ }
+ }
+ }
+ catch ( Exception e ) {/*ignore*/}
+ }
+ return extraBorderProvider;
+ }
+
public ArrayList<String> getNames()
{
List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
@@ -119,6 +153,8 @@
{
addNames( item, names );
}
+ ConfigureBorderExtraProvider c = getConfigureBorderExtraClass();
+ if ( c != null ) names.addAll( c.getNames() );
return names;
}
@@ -133,6 +169,11 @@
{
addLabels( item, labels );
}
+ ConfigureBorderExtraProvider c = getConfigureBorderExtraClass();
+ if ( c != null )
+ {
+ for ( String l : c.getLabels() ) labels.add( getMessages().getMessage( l ) );
+ }
return labels;
}
@@ -144,6 +185,8 @@
{
addOffsets( item, offsets, 0 );
}
+ ConfigureBorderExtraProvider c = getConfigureBorderExtraClass();
+ if ( c != null ) offsets.addAll( c.getOffsets() );
return offsets;
}
Added: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ConfigureBorderExtraProvider.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ConfigureBorderExtraProvider.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ConfigureBorderExtraProvider.java 2009-04-29 15:28:44 UTC (rev 3819)
@@ -0,0 +1,18 @@
+package be.unid.tapestry.util;
+
+import java.util.List;
+
+/**
+ * Extra items that will appear in the Border Config.
+ *
+ * @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+ * @version $Revision$
+ */
+public interface ConfigureBorderExtraProvider
+{
+ List<String> getNames();
+
+ List<String> getLabels();
+
+ List<Integer> getOffsets();
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/ConfigureBorderExtraProvider.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties
===================================================================
--- trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties 2009-04-29 14:53:22 UTC (rev 3818)
+++ trunk/Uni-d/test/src/etc/site_tapestry/site.war/config.properties 2009-04-29 15:28:44 UTC (rev 3819)
@@ -10,3 +10,4 @@
login-image-path=logo.png
max-alerts=20
alerts-show-warnings=true
+;configure-border-extra-class=XXX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-04-29 14:53:26
|
Revision: 3818
http://uni-d.svn.sourceforge.net/uni-d/?rev=3818&view=rev
Author: max_brod
Date: 2009-04-29 14:53:22 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
Fix to get the menu displayed in the test application.
Modified Paths:
--------------
trunk/Uni-d/test/src/etc/site_tapestry/site.war/WEB-INF/Border.html
Modified: trunk/Uni-d/test/src/etc/site_tapestry/site.war/WEB-INF/Border.html
===================================================================
--- trunk/Uni-d/test/src/etc/site_tapestry/site.war/WEB-INF/Border.html 2009-04-28 15:57:55 UTC (rev 3817)
+++ trunk/Uni-d/test/src/etc/site_tapestry/site.war/WEB-INF/Border.html 2009-04-29 14:53:22 UTC (rev 3818)
@@ -28,6 +28,9 @@
<script type="text/javascript" src="CaseConversionScript.js"></script>
</head>
+ <script type="text/javascript">
+ var topimagemenu = '';
+ </script>
<body jwcid="@Body">
<span jwcid="@If" condition="prop:refreshNeeded">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-04-28 15:57:59
|
Revision: 3817
http://uni-d.svn.sourceforge.net/uni-d/?rev=3817&view=rev
Author: max_brod
Date: 2009-04-28 15:57:55 +0000 (Tue, 28 Apr 2009)
Log Message:
-----------
[UNI-463]
Improvement for speed in the border useradmin pages: calculate offsets only once.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java 2009-04-23 13:36:17 UTC (rev 3816)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java 2009-04-28 15:57:55 UTC (rev 3817)
@@ -116,25 +116,22 @@
{
List<String> names = getNames();
List<String> labels = getLabels();
+ List<Integer> offsets=getDisplayOffsets();
if ( names.size() != labels.size() )
{
- for ( int i = 0; i < names.size() ; i++ ) System.out.println( " name = " + names.get( i ) );
- for ( int i = 0; i < labels.size() ; i++ ) System.out.println( " label = " + labels.get( i ) );
throw new RuntimeException( "incorrect combination names/labels " + names.size() + " != " + labels.size() );
}
- boolean hasDisplayOffsets = getDisplayOffsets() != null && getDisplayOffsets().size() > 0;
- if ( hasDisplayOffsets && getDisplayOffsets().size() != names.size() )
+ boolean hasDisplayOffsets = offsets != null && offsets.size() > 0;
+ if ( hasDisplayOffsets && offsets.size() != names.size() )
{
- for ( int i = 0; i < names.size() ; i++ ) System.out.println( " name = " + names.get( i ) );
- for ( int i = 0; i < getDisplayOffsets().size() ; i++ ) System.out.println( " offset = " + getDisplayOffsets().get( i ) );
throw new RuntimeException( "incorrect combination names/displayOffsets" + names.size() + " != " +
- getDisplayOffsets().size() );
+ offsets.size() );
}
ArrayList<Item> ret = new ArrayList<Item>();
for ( int i = 0; i < names.size() ; i++ )
{
ret.add( new Item( names.get( i ), labels.get( i ), true,
- hasDisplayOffsets ? getDisplayOffsets().get( i ) : 0 ) );
+ hasDisplayOffsets ? offsets.get( i ) : 0 ) );
}
setItems( ret );
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-23 13:36:17 UTC (rev 3816)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-28 15:57:55 UTC (rev 3817)
@@ -63,11 +63,6 @@
ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
for ( Parser.ItemDescription child : newitems ) addNames( child, names );
}
- else if ( item.getPage() != null && item.getPage().contains( "ReportList" ) )
- {
-
- }
-
}
private void addLabels( Parser.ItemDescription item, ArrayList<String> labels )
@@ -84,11 +79,6 @@
ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
for ( Parser.ItemDescription child : newitems ) addLabels( child, labels );
}
- else if ( item.getPage() != null && item.getPage().contains( "ReportList" ) )
- {
-
- }
-
}
private void addOffsets( Parser.ItemDescription item, ArrayList<Integer> offsets, int startoffset )
@@ -106,10 +96,7 @@
ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
for ( Parser.ItemDescription child : newitems ) addOffsets( child, offsets, start );
}
- else if ( item.getPage() != null && item.getPage().contains( "ReportList" ) )
- {
- }
}
private Integer calculateOffset( Parser.ItemDescription item )
@@ -198,15 +185,13 @@
{
if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "tc" + category ) ) continue;
if ( !getSessionUserAdmin().hasAccess( "tc" + category, AccessRight.TABLE_PREFERENCE_DISPLAY ) ) continue;
- ArrayList<String> tables = categories.get( category );
Parser.ItemDescription item = new ItemDescriptionEx();
item.setKey( "category." + category + ".label" );
item.setUserAdminId( "tc" + category );
//item.setParent( parent );
//parent.getItems().add( item );
list.add( item );
- System.out.println( "add cat : " + category );
- ArrayList<String[]> calculatedTables = new ArrayList<String[]>();
+ //ArrayList<String[]> calculatedTables = new ArrayList<String[]>();
//for ( String table : tables )
//{
// if ( table.startsWith( "Unid" ) ) continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-23 14:22:18
|
Revision: 3816
http://uni-d.svn.sourceforge.net/uni-d/?rev=3816&view=rev
Author: pushkutza
Date: 2009-04-23 13:36:17 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
ICT-1446
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-04-22 16:40:02 UTC (rev 3815)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/shared/ConfigurationKeys.java 2009-04-23 13:36:17 UTC (rev 3816)
@@ -38,6 +38,7 @@
public static final String GUI_SELECT_PAGE_SIZE = "gui-select-page-size";
public static final String KEEP_ALIVE_REFRESH_TIME = "keep-alive-refresh-time";
public static final String LOGOFF_TIMEOUT_CLASS = "logoff-timeout-class";
+ public static final String LOGIN_INIT_CLASS = "login-init-class";
public static final String LOGIN_IMAGE_PATH = "login-image-path";
public static final String FINDER_LIMIT = "finder-limit";
public static final String LOGO_FILE = "logo-file";
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java 2009-04-22 16:40:02 UTC (rev 3815)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java 2009-04-23 13:36:17 UTC (rev 3816)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -34,6 +34,10 @@
import be.unid.tapestry.useradmin.SessionUserAdmin;
import be.unid.tapestry.util.LoginResolver;
import be.unid.tapestry.util.Visit;
+import be.unid.tapestry.util.ResourceUtil;
+import be.unid.tapestry.util.LogoffTimeout;
+import be.unid.tapestry.pool.Pool;
+import be.unid.tapestry.components.shared.ConfigurationKeys;
import org.apache.log4j.Logger;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.RedirectException;
@@ -194,6 +198,26 @@
{
getRequestCycle().getEngine().setLocale( new Locale( language ) );
}
+
+ try
+ {
+ Object initclass =
+ Pool.getClass( ResourceUtil.getConfigString( ConfigurationKeys.LOGIN_INIT_CLASS ) );
+ if ( initclass != null )
+ {
+ if ( initclass instanceof Runnable )
+ {
+ ( (Runnable) initclass ).run();
+ }
+ else
+ {
+ log.error(
+ "Class '" + ResourceUtil.getConfigString( ConfigurationKeys.LOGIN_INIT_CLASS ) +
+ "' does not implement java.lang.Runnable!" );
+ }
+ }
+ }
+ catch ( Exception e ) {/*ignore*/}
}
catch ( Exception ex )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-04-22 16:40:15
|
Revision: 3815
http://uni-d.svn.sourceforge.net/uni-d/?rev=3815&view=rev
Author: max_brod
Date: 2009-04-22 16:40:02 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
[ICT-1555]
New field in UnidUser table - AccessUserMenu, boolean = "show or not the user preferences menu".
Modified Paths:
--------------
trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table
trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.html
Modified: trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table
===================================================================
--- trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/useradmin/UnidUser.table 2009-04-22 16:40:02 UTC (rev 3815)
@@ -33,6 +33,12 @@
<choice name="LANGUAGE_GERMAN" value="de"/>
</field>
+ <field name="AccessUserMenu" type="boolean">
+ <description>
+ Is user allow to view the preferences menu?
+ </description>
+ </field>
+
<field name="TablesPreferences" type="UnidRight">
<description>Preferences to view/or not tables</description>
<hide/>
@@ -79,7 +85,6 @@
<no-translation/>
</field>
-
<field name="StartPage" type="string">
<description>Starting page in GUI</description>
<hide/>
Modified: trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java
===================================================================
--- trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/server/src/main/java/be/unid/login/LoginInfo.java 2009-04-22 16:40:02 UTC (rev 3815)
@@ -44,6 +44,7 @@
String language;
List<String> roles;
long deadline;
+ boolean acccessUserMenu;
public LoginInfo(){}
@@ -137,4 +138,14 @@
{
this.deadline = deadline;
}
+
+ public boolean isAcccessUserMenu()
+ {
+ return acccessUserMenu;
+ }
+
+ public void setAcccessUserMenu( boolean acccessUserMenu )
+ {
+ this.acccessUserMenu = acccessUserMenu;
+ }
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java 2009-04-22 16:40:02 UTC (rev 3815)
@@ -81,6 +81,11 @@
return getSessionUserAdmin().isUserAdministrator();
}
+ public boolean isAccessUserMenu()
+ {
+ return getSessionUserAdmin().isAcccessUserMenu();
+ }
+
public void gotoLoginMenu()
{
if ( getNavPage() == null )
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/UnidBasePage.java 2009-04-22 16:40:02 UTC (rev 3815)
@@ -162,6 +162,7 @@
info = buildNewLoginInfo();
info.setUserName( userName );
info.setAdministrator( true );
+ info.setAcccessUserMenu( true );
}
if ( log.isDebugEnabled() ) log.debug( "jaas hocus pocus" );
@@ -179,6 +180,8 @@
sessionUserAdmin.setUserName( info.getUserName() );
sessionUserAdmin.setPassword( info.getPassword() );
sessionUserAdmin.setUserAdministrator( info.isAdministrator() );
+ sessionUserAdmin.setAcccessUserMenu( info.isAcccessUserMenu() );
+
Set<SimplePrincipal> roles = jsm.getUserRoles( new SimplePrincipal( info.getUserName() ) );
sessionUserAdmin.setRoles( roles != null ? roles : new ArrayList<SimplePrincipal>() );
String language = info.getLanguage();
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/useradmin/SessionUserAdmin.java 2009-04-22 16:40:02 UTC (rev 3815)
@@ -29,6 +29,7 @@
private transient boolean loggedIn; // if the user is logged in
private transient boolean userAdministrator; // current user is administrator
private transient Collection<SimplePrincipal> roles;// roles for the logged in user
+ private transient boolean acccessUserMenu; // is user allowed to see the user preferences menu
private transient long lastAccess;
@@ -270,4 +271,14 @@
{
return lastAccess > 0 && ( System.currentTimeMillis() - lastAccess > getTimeout() );
}
+
+ public boolean isAcccessUserMenu()
+ {
+ return acccessUserMenu;
+ }
+
+ public void setAcccessUserMenu( boolean acccessUserMenu )
+ {
+ this.acccessUserMenu = acccessUserMenu;
+ }
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/LoginResolver.java 2009-04-22 16:40:02 UTC (rev 3815)
@@ -56,6 +56,7 @@
info.setPassword( (String) UnidProxyAccessor.getField( user, "Password" ) );
info.setAdministrator( isAdmin );
info.setLanguage( (String) UnidProxyAccessor.getField( user, "Language" ) );
+ info.setAcccessUserMenu( (Boolean)UnidProxyAccessor.getField( user, "AccessUserMenu" ) );
return info;
}
return null;
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.html 2009-04-21 15:11:54 UTC (rev 3814)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.html 2009-04-22 16:40:02 UTC (rev 3815)
@@ -51,10 +51,12 @@
</td>
</span>
- <td width="32" id="ConfigPage">
- <span jwcid="@NavigationLink"
- listener="listener:gotoUserMenu" id="link_user_menu"><img jwcid="@Image" image="asset:imageUserMenu" border="0" /></span>
- </td>
+ <span jwcid="@If" condition="prop:accessUserMenu">
+ <td width="32" id="ConfigPage">
+ <span jwcid="@NavigationLink"
+ listener="listener:gotoUserMenu" id="link_user_menu"><img jwcid="@Image" image="asset:imageUserMenu" border="0" /></span>
+ </td>
+ </span>
</span>
<span jwcid="@Else">
<span key="UserName"/>:
@@ -67,8 +69,10 @@
<img jwcid="@Image" image="asset:imageAdminMenu" border="0" align="center"/></span>
</span>
- <span jwcid="@NavigationLink" listener="listener:gotoUserMenu" id="link_user_menu">
- <img jwcid="@Image" image="asset:imageUserMenu" border="0" align="center"/>
+ <span jwcid="@If" condition="prop:accessUserMenu">
+ <span jwcid="@NavigationLink" listener="listener:gotoUserMenu" id="link_user_menu">
+ <img jwcid="@Image" image="asset:imageUserMenu" border="0" align="center"/>
+ </span>
</span>
</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-21 15:11:59
|
Revision: 3814
http://uni-d.svn.sourceforge.net/uni-d/?rev=3814&view=rev
Author: pushkutza
Date: 2009-04-21 15:11:54 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
ICT-1545
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.html
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.html 2009-04-21 15:11:15 UTC (rev 3813)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.html 2009-04-21 15:11:54 UTC (rev 3814)
@@ -41,6 +41,7 @@
labels="prop:labels"
roleConfiguration="literal:true"
modelRole="prop:selectionModel"
+ displayOffsets="prop:offsets"
/>
</border>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-21 15:11:23
|
Revision: 3813
http://uni-d.svn.sourceforge.net/uni-d/?rev=3813&view=rev
Author: pushkutza
Date: 2009-04-21 15:11:15 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
ICT-1545
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.html
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configList/ConfigList.html
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/userBorderConfig/UserBorderConfig.html
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-04-21 15:11:15 UTC (rev 3813)
@@ -196,6 +196,8 @@
new TreeMap<ArrayWrapper, ArrayList<String[]>>();
for ( String category : categories.keySet() )
{
+ if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "tc" + category ) ) continue;
+ if ( !getSessionUserAdmin().hasAccess( "tc" + category, AccessRight.TABLE_PREFERENCE_DISPLAY ) ) continue;
ArrayList<String> tables = categories.get( category );
ArrayWrapper calculatedCategory =
new ArrayWrapper( getMessages().getMessage( "category." + category + ".label" ), category, true );
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.java 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.java 2009-04-21 15:11:15 UTC (rev 3813)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -56,13 +56,24 @@
@Parameter( name = "value", required = true )
public abstract Object getValue();
+ @Parameter( name = "displayOffset", defaultValue = "0" )
+ public abstract int getDisplayOffset();
+
public abstract void setValue( Object value );
public String getItemId()
{
- return "ID_"+getKey();
+ return "ID_" + getKey();
}
+ public String getOffsetString()
+ {
+ StringBuffer buf = new StringBuffer( " " );
+ for ( int i = 1; i < getDisplayOffset() ; i++ ) buf.append( " " );
+ buf.append( "-" ).append( " " );
+ return buf.toString();
+ }
+
/**
* ********************************** Assets defintions: *************************************
*/
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/configList/ConfigList.java 2009-04-21 15:11:15 UTC (rev 3813)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -33,7 +33,6 @@
import be.unid.tapestry.util.UnidFormValidator;
import be.unid.tapestry.util.UnidProxyAccessor;
import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.annotations.Bean;
import org.apache.tapestry.annotations.Parameter;
@@ -43,7 +42,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.io.Serializable;
/**
* basic component that should handle the configurations for border/tables .. for both admin and user.
@@ -58,11 +56,14 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( ConfigList.class );
@Parameter( name = "names", required = true )
- public abstract ArrayList getNames();
+ public abstract ArrayList<String> getNames();
@Parameter( name = "labels", required = true )
- public abstract ArrayList getLabels();
+ public abstract ArrayList<String> getLabels();
+ @Parameter( name = "displayOffsets", required = false )
+ public abstract ArrayList<Integer> getDisplayOffsets();
+
@Parameter( name = "roleConfiguration", required = true )
public abstract boolean isRoleConfiguration();
@@ -113,16 +114,27 @@
public void initialItems()
{
- List names = getNames();
- List labels = getLabels();
+ List<String> names = getNames();
+ List<String> labels = getLabels();
if ( names.size() != labels.size() )
{
- throw new RuntimeException( "incorrect combination names/labels" );
+ for ( int i = 0; i < names.size() ; i++ ) System.out.println( " name = " + names.get( i ) );
+ for ( int i = 0; i < labels.size() ; i++ ) System.out.println( " label = " + labels.get( i ) );
+ throw new RuntimeException( "incorrect combination names/labels " + names.size() + " != " + labels.size() );
}
+ boolean hasDisplayOffsets = getDisplayOffsets() != null && getDisplayOffsets().size() > 0;
+ if ( hasDisplayOffsets && getDisplayOffsets().size() != names.size() )
+ {
+ for ( int i = 0; i < names.size() ; i++ ) System.out.println( " name = " + names.get( i ) );
+ for ( int i = 0; i < getDisplayOffsets().size() ; i++ ) System.out.println( " offset = " + getDisplayOffsets().get( i ) );
+ throw new RuntimeException( "incorrect combination names/displayOffsets" + names.size() + " != " +
+ getDisplayOffsets().size() );
+ }
ArrayList<Item> ret = new ArrayList<Item>();
for ( int i = 0; i < names.size() ; i++ )
{
- ret.add( new Item( (String) names.get( i ), (String) labels.get( i ), true ) );
+ ret.add( new Item( names.get( i ), labels.get( i ), true,
+ hasDisplayOffsets ? getDisplayOffsets().get( i ) : 0 ) );
}
setItems( ret );
}
@@ -264,12 +276,26 @@
return getCurrentItem().label;
}
+ public Integer getItemDisplayOffset()
+ {
+ return getCurrentItem().displayOffset;
+ }
+
public class Item
{
public String name;
public String label;
public boolean value;
+ public int displayOffset;
+ public Item( String name, String label, boolean value, int displayOffset )
+ {
+ this.name = name;
+ this.label = label;
+ this.value = value;
+ this.displayOffset = displayOffset;
+ }
+
public Item( String name, String label, boolean value )
{
this.name = name;
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-04-21 15:11:15 UTC (rev 3813)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -27,13 +27,17 @@
import be.unid.tapestry.navigation.NavigationablePageImpl;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescriptionEx;
import be.unid.tapestry.pool.Pool;
+import be.unid.tapestry.components.shared.DescriptionFactory;
+import be.unid.tapestry.rights.AccessRight;
import be.unid.validation.SimpleValidator;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import org.apache.tapestry.form.IPropertySelectionModel;
+import org.apache.tapestry.IEngine;
+import org.apache.tapestry.IRequestCycle;
/**
* Page to configure visibility of border items, for any role
@@ -48,25 +52,80 @@
private void addNames( Parser.ItemDescription item, ArrayList<String> names )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return;
+ if ( "cbSplit".equals( item.getUserAdminId() ) ) return;
names.add( item.getUserAdminId() );
for ( Parser.ItemDescription child : item.getItems() )
{
addNames( child, names );
}
+ if ( item.getPage() != null && item.getPage().contains( "TablesIndex" ) )
+ {
+ ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
+ for ( Parser.ItemDescription child : newitems ) addNames( child, names );
+ }
+ else if ( item.getPage() != null && item.getPage().contains( "ReportList" ) )
+ {
+
+ }
+
}
private void addLabels( Parser.ItemDescription item, ArrayList<String> labels )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return;
+ if ( "cbSplit".equals( item.getUserAdminId() ) ) return;
labels.add( getMessages().getMessage( item.getKey() ) );
for ( Parser.ItemDescription child : item.getItems() )
{
addLabels( child, labels );
}
+ if ( item.getPage() != null && item.getPage().contains( "TablesIndex" ) )
+ {
+ ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
+ for ( Parser.ItemDescription child : newitems ) addLabels( child, labels );
+ }
+ else if ( item.getPage() != null && item.getPage().contains( "ReportList" ) )
+ {
+
+ }
+
}
- public ArrayList getNames()
+ private void addOffsets( Parser.ItemDescription item, ArrayList<Integer> offsets, int startoffset )
{
+ if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return;
+ if ( "cbSplit".equals( item.getUserAdminId() ) ) return;
+ offsets.add( calculateOffset( item ) + startoffset );
+ for ( Parser.ItemDescription child : item.getItems() )
+ {
+ addOffsets( child, offsets, 0 );
+ }
+ if ( item.getPage() != null && item.getPage().contains( "TablesIndex" ) )
+ {
+ int start = calculateOffset( item );
+ ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
+ for ( Parser.ItemDescription child : newitems ) addOffsets( child, offsets, start );
+ }
+ else if ( item.getPage() != null && item.getPage().contains( "ReportList" ) )
+ {
+
+ }
+ }
+
+ private Integer calculateOffset( Parser.ItemDescription item )
+ {
+ int i = 0;
+ Parser.ItemDescription totest = item;
+ while ( totest != null )
+ {
+ i++;
+ totest = totest.getParent();
+ }
+ return i;
+ }
+
+ public ArrayList<String> getNames()
+ {
List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
ArrayList<String> names = new ArrayList<String>();
for ( Parser.ItemDescription item : items )
@@ -79,7 +138,7 @@
/**
* Provides the list of report labels (for internationalization)
*/
- public ArrayList getLabels()
+ public ArrayList<String> getLabels()
{
List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
ArrayList<String> labels = new ArrayList<String>();
@@ -90,6 +149,17 @@
return labels;
}
+ public ArrayList<Integer> getOffsets()
+ {
+ List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
+ ArrayList<Integer> offsets = new ArrayList<Integer>();
+ for ( Parser.ItemDescription item : items )
+ {
+ addOffsets( item, offsets, 0 );
+ }
+ return offsets;
+ }
+
public IPropertySelectionModel getSelectionModel()
{
return new be.unid.tapestry.selectionModel.RoleSelectionModel( getPage() );
@@ -109,4 +179,85 @@
}
return true;
}
+
+ ArrayList<Parser.ItemDescription> list = new ArrayList<Parser.ItemDescription>();
+
+ @Override
+ public void attach( IEngine iEngine, IRequestCycle iRequestCycle )
+ {
+ super.attach( iEngine, iRequestCycle );
+ list = new ArrayList<Parser.ItemDescription>();
+ }
+
+ public ArrayList<Parser.ItemDescription> buildTableCategories( /*Parser.ItemDescription parent*/ )
+ {
+ if ( list != null && list.size() > 0 ) return list;
+ list = new ArrayList<Parser.ItemDescription>();
+ Map<String, ArrayList<String>> categories = DescriptionFactory.getCategories();
+ for ( String category : categories.keySet() )
+ {
+ if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "tc" + category ) ) continue;
+ if ( !getSessionUserAdmin().hasAccess( "tc" + category, AccessRight.TABLE_PREFERENCE_DISPLAY ) ) continue;
+ ArrayList<String> tables = categories.get( category );
+ Parser.ItemDescription item = new ItemDescriptionEx();
+ item.setKey( "category." + category + ".label" );
+ item.setUserAdminId( "tc" + category );
+ //item.setParent( parent );
+ //parent.getItems().add( item );
+ list.add( item );
+ System.out.println( "add cat : " + category );
+ ArrayList<String[]> calculatedTables = new ArrayList<String[]>();
+ //for ( String table : tables )
+ //{
+ // if ( table.startsWith( "Unid" ) ) continue;
+ // GMTable gmTable = DescriptionFactory.getTableDescription( table );
+ // if ( gmTable.isHiddenIf() )
+ // {
+ // Object o = Pool.getClass( gmTable.getHideIfClass() );
+ // if ( o != null )
+ // {
+ // if ( gmTable.getHideIfParameters() != null )
+ // {
+ // ( (HideIf) o ).setParameters( gmTable.getHideIfParameters() );
+ // }
+ // if ( ( (HideIf) o ).isHidden() ) continue;
+ // }
+ // }
+ // if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "t" + table ) ) continue;
+ // if ( !getSessionUserAdmin().hasAccess( "t" + table, AccessRight.TABLE_PREFERENCE_DISPLAY ) )
+ // {
+ // continue;
+ // }
+ // String label = getMessages().getMessage( "table." + table + ".label" );
+ // label = label.replace( "\'", "'" );
+ // calculatedTables.add( new String[]{ label, table, gmTable.getDisplayIndex() } );
+ // Parser.ItemDescription itemTable = new ItemDescriptionEx();
+ // itemTable.setKey( "table." + table + ".label" );
+ // itemTable.setUserAdminId( "t" + table );
+ // itemTable.setParent( item );
+ // item.getItems().add( itemTable );
+ // System.out.println( "add table : " + table + " in cat " + category );
+ //}
+ }
+ Collections.sort( list, new Comparator<Parser.ItemDescription>()
+ {
+ public int compare( Parser.ItemDescription o1, Parser.ItemDescription o2 )
+ {
+ if ( o1 == null )
+ {
+ if ( o2 == null ) return 0;
+ return -1;
+ }
+ if ( o2 == null ) return 1;
+ if ( o1.getKey() == null )
+ {
+ if ( o2.getKey() == null ) return 0;
+ return -1;
+ }
+ if ( o2.getKey() == null ) return 1;
+ return o1.getKey().compareTo( o2.getKey() );
+ }
+ } );
+ return list;
+ }
}
Added: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java 2009-04-21 15:11:15 UTC (rev 3813)
@@ -0,0 +1,12 @@
+package be.unid.tapestry.parser.border;
+
+/**
+ * Description!!!
+ *
+ * @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+ * @version $Revision$
+ */
+public class ItemDescriptionEx
+ extends Parser.ItemDescription
+{
+}
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java 2009-04-21 15:11:15 UTC (rev 3813)
@@ -150,7 +150,7 @@
}
}
- public class ItemDescription
+ public static class ItemDescription
{
public String getPage()
{
@@ -242,6 +242,16 @@
this.childItems = childItems;
}
+ public ItemDescription getParent()
+ {
+ return parent;
+ }
+
+ public void setParent( ItemDescription parent )
+ {
+ this.parent = parent;
+ }
+
private String page;
private String icon;
private String key;
@@ -250,6 +260,7 @@
private String validator;
private String validatorParameters;
private String translatorClass;
+ private ItemDescription parent;
private List<ItemDescription> items = new ArrayList<ItemDescription>();
}
@@ -264,6 +275,7 @@
item.setValidatorParameters( node.getAttribute( VALIDATOR_PARAMETERS ) );
item.setTranslatorClass( node.getAttribute( TRANSLATOR_CLASS ) );
item.setChildItems( node.getAttribute( CHILDITEMS ) );
+ item.setParent( parent );
Node child = node.getFirstChild();
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.html 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configItem/ConfigItem.html 2009-04-21 15:11:15 UTC (rev 3813)
@@ -33,6 +33,9 @@
</span>
<tr>
<td>
+ <span jwcid="@If" condition="ognl:displayOffset != 0">
+ <span jwcid="@Insert" value="ognl:getOffsetString()" raw="ognl:true"/>
+ </span>
<span jwcid="@Insert" value="prop:internationalizedLabel"/>
</td>
<td>
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configList/ConfigList.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configList/ConfigList.html 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/userAdmin/configList/ConfigList.html 2009-04-21 15:11:15 UTC (rev 3813)
@@ -84,6 +84,7 @@
<span jwcid="@For" source="prop:items" value="prop:currentItem" volatile="literal:true">
<span jwcid="@ConfigItem" value="prop:itemValue"
internationalizedLabel="prop:itemLabel"
+ displayOffset="prop:itemDisplayOffset"
key="prop:itemName"/>
</span>
</table>
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/userBorderConfig/UserBorderConfig.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/userBorderConfig/UserBorderConfig.html 2009-04-15 13:31:30 UTC (rev 3812)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/userAdmin/userBorderConfig/UserBorderConfig.html 2009-04-21 15:11:15 UTC (rev 3813)
@@ -41,6 +41,7 @@
names="prop:names"
labels="prop:labels"
roleConfiguration="literal:false"
+ displayOffsets="prop:offsets"
/>
</border>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-04-15 14:22:19
|
Revision: 3812
http://uni-d.svn.sourceforge.net/uni-d/?rev=3812&view=rev
Author: pushkutza
Date: 2009-04-15 13:31:30 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
ICT-1525
Modified Paths:
--------------
trunk/Uni-d/template/src/main/webapp/JSCookMenu/JSCookMenu.js
trunk/Uni-d/template/src/main/webapp/images/boxborder.jpg
Added Paths:
-----------
trunk/Uni-d/template/src/main/webapp/images/fademenu.jpg
trunk/Uni-d/template/src/main/webapp/images/legend.png
trunk/Uni-d/template/src/main/webapp/images/menuBorder.jpg
trunk/Uni-d/template/src/main/webapp/images/orangesmallbutton.gif
Modified: trunk/Uni-d/template/src/main/webapp/JSCookMenu/JSCookMenu.js
===================================================================
--- trunk/Uni-d/template/src/main/webapp/JSCookMenu/JSCookMenu.js 2009-04-08 09:51:50 UTC (rev 3811)
+++ trunk/Uni-d/template/src/main/webapp/JSCookMenu/JSCookMenu.js 2009-04-15 13:31:30 UTC (rev 3812)
@@ -395,8 +395,17 @@
nodeProperties.offsetSubAdjust = _cmNodeProperties.offsetSubAdjust;
// save user setting on frame masking
menuInfo.cmFrameMasking = _cmFrameMasking;
- // the topimagemenu was added custom
- var str = '<img class="topimagemenu" src="/admin/images/boxborder.jpg"/>'+'<table summary="main menu" class="' + prefix + 'Menu" cellspacing="' + nodeProperties.mainSpacing + '">';
+ // the topimagemenu was added custom
+ var str = '';
+ if (topimagemenu && topimagemenu != "")
+ {
+ str = topimagemenu;
+ }
+ else
+ {
+ str = '<img class="topimagemenu" src="/admin/images/boxborder.jpg"/>';
+ }
+ var str = str+'<table summary="main menu" class="' + prefix + 'Menu" cellspacing="' + nodeProperties.mainSpacing + '">';
var strSub = '';
var vertical;
Modified: trunk/Uni-d/template/src/main/webapp/images/boxborder.jpg
===================================================================
(Binary files differ)
Added: trunk/Uni-d/template/src/main/webapp/images/fademenu.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/template/src/main/webapp/images/fademenu.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision
Added: trunk/Uni-d/template/src/main/webapp/images/legend.png
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/template/src/main/webapp/images/legend.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision
Added: trunk/Uni-d/template/src/main/webapp/images/menuBorder.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/template/src/main/webapp/images/menuBorder.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision
Added: trunk/Uni-d/template/src/main/webapp/images/orangesmallbutton.gif
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/template/src/main/webapp/images/orangesmallbutton.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Author Date Id Revision
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
