Author: husted
Date: Sat Feb 18 12:49:45 2006
New Revision: 378774
URL: http://svn.apache.org/viewcvs?rev=378774&view=rev
Log:
OVR-14
* BindListControl - Check for list pointer (--v--) on postbacks too, in case
the list changes dynamically
* Reset - Clear checkboxes too.
OVR-24
* Add special handling for DataGrid's with template columns
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Nexus.Core.xml
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/Nexus.Core.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Nexus.Core.xml?rev=378774&r1=378773&r2=378774&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Nexus.Core.xml (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Nexus.Core.xml Sat Feb 18
12:49:45 2006
@@ -1084,7 +1084,7 @@
</summary>
<param name="command">Command ID</param>
<returns>IRequestCommand instance for name</returns>
- <exception cref="T:System.Exception">
+ <exception cref="!:Exception">
Throws Exception if name is null,
name is not in catalog,
or if instance for name is not a IRequestCommand
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=378774&r1=378773&r2=378774&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Sat Feb 18
12:49:45 2006
@@ -447,6 +447,19 @@
continue;
}
}
+
+ /// Workaround so that template columns can be utilized
by a dynamic DataGrid.
+ /// [OVR-24] - Template columns not passed by
DataGridCommandEventArgs
+ foreach (IGridConfig c in Configs)
+ {
+ bool isTemplateColumn = c.ItemTemplate!=null;
+ if (isTemplateColumn)
+ {
+ string key = c.DataField;
+ string value = FindControlValue(key);
+ dictionary.Add(key,value);
+ }
+ }
}
#endregion
@@ -484,7 +497,7 @@
return helper;
}
- protected virtual IViewHelper Save(string key,
ControlCollection controls, bool execute)
+ protected virtual IViewHelper Save(string key,
ControlCollection controls)
{
IViewHelper h = GetHelperFor(SaveCommand);
if (h.IsNominal)
@@ -502,14 +515,10 @@
for (int i = 0; i < cols; i++)
keys[index++] = (configs[i] as
IGridConfig).DataField;
ReadGridControls(controls, h.Criteria, keys,
true);
- if (execute) h.Execute();
+
+ h.Execute();
}
return h;
- }
-
- protected virtual IViewHelper Save(string key,
ControlCollection controls)
- {
- return Save(key, controls, true);
}
#endregion
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=378774&r1=378773&r2=378774&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs Sat Feb 18
12:49:45 2006
@@ -347,6 +347,13 @@
x.Checked = false;
continue;
}
+
+ if (IsCheckBox(control))
+ {
+ CheckBox x = (CheckBox) control;
+ x.Checked = false;
+ continue;
+ }
}
}
@@ -717,6 +724,8 @@
///
private void BindListControl(ListControl control, IList list,
string value)
{
+ bool insertKey = ((list != null) &&
(!list.Contains(NullKey)));
+ if (insertKey) list.Insert(0, NullKey);
control.DataTextField = "Value";
control.DataValueField = "Key";
control.DataSource = list;
@@ -726,8 +735,6 @@
protected void BindListControl(ListControl control, IList list)
{
- bool insertKey = ((list != null) &&
(!list.Contains(NullKey)));
- if (insertKey) list.Insert(0, NullKey);
BindListControl(control, list, null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
