Author: husted
Date: Wed Nov 23 07:13:56 2005
New Revision: 348456
URL: http://svn.apache.org/viewcvs?rev=348456&view=rev
Log:
OVR-21
* DropDownMenuTemplate - Add option to constructor to add a "null key" to the
list, so that an item can not be selected.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs?rev=348456&r1=348455&r2=348456&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs
(original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs
Wed Nov 23 07:13:56 2005
@@ -14,7 +14,7 @@
bool okay = false;
string source = incoming.Source as string;
- if (IsStringEmpty(source))
+ if (IsInput(source))
{
DateTime t = DateTime_Convert(source);
bool isDateTimeEmpty = DateTime_Empty.Equals(t);
@@ -44,14 +44,14 @@
{
string target = DateTime_Format(source);
outgoing.Target = target;
- okay = IsStringEmpty(target);
+ okay = IsInput(target);
}
return okay;
}
#endregion
- private bool IsStringEmpty(string v)
+ private bool IsInput(string v)
{
return ((v != null) && (!String.Empty.Equals(v)));
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs?rev=348456&r1=348455&r2=348456&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs Wed
Nov 23 07:13:56 2005
@@ -201,7 +201,7 @@
/// so that the letters are ready to present.
/// </summary>
///
- public bool Open()
+ public override bool Open()
{
if (LetterTable == null)
{
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs?rev=348456&r1=348455&r2=348456&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Wed Nov 23
07:13:56 2005
@@ -1059,8 +1059,8 @@
public KeyValueTemplate(string dataField, IKeyValueList
list)
{
_DataField = dataField;
- _Control = list;
- }
+ _Control = list;
+ }
}
public class DropDownListTemplate : ITemplate
@@ -1134,8 +1134,18 @@
_Control.PreRender += new
EventHandler(OnPreRender);
}
- public DropDownListTemplate(string id, IKeyValueList
list)
+ public DropDownListTemplate(string id, IKeyValueList
list) : this(id,list,false)
+ {
+
+ }
+
+ public DropDownListTemplate(string id, IKeyValueList
list, bool insertNullKey)
{
+ if (insertNullKey)
+ {
+ list.Insert(0, new
KeyValue(String.Empty, NULL_TOKEN));
+ }
+
_DataField = id;
_Control = new DropDownList();
_Control.ID = id;
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs?rev=348456&r1=348455&r2=348456&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs Wed Nov 23
07:13:56 2005
@@ -75,7 +75,9 @@
return trimmed;
}
- private static KeyValue _NullKey = new KeyValue(String.Empty,
"--v--");
+ public const string NULL_TOKEN = "--v--";
+
+ private static KeyValue _NullKey = new KeyValue(String.Empty,
NULL_TOKEN);
/// <summary>
/// Default value for dropdown lists.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
