You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/09/13 22:28:01 UTC

svn commit: r280643 - in /struts/sandbox/trunk/overdrive/PhoneBook: Test/Resources/Command/ Web/ Web/Controls/ Web/Resources/Command/

Author: husted
Date: Tue Sep 13 13:27:50 2005
New Revision: 280643

URL: http://svn.apache.org/viewcvs?rev=280643&view=rev
Log:
OVR-21
* Remove cruft

Removed:
    struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs
Modified:
    struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml
    struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml
    struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml Tue Sep 13 13:27:50 2005
@@ -13,22 +13,6 @@
 		</property>		
 	</object>
 	
-  	<object id="BaseGridHelper" type="PhoneBook.Web.AppGridHelper, PhoneBook.Web" singleton="false">
-		<property name="Catalog">
-			<ref object="Catalog" />
-		</property>
-		<property name="MessageSource">
-			<ref object="messageSource" />
-		</property>		
-	</object>
-
-	<!-- All child helpers must also specify singleton=false; otherwise, Context is shared. -->
-	<object id="BaseHelper" type="Nexus.Web.WebViewHelper, Nexus.Web" singleton="false">
-		<property name="Catalog">
-			<ref object="Catalog" />
-		</property>
-	</object>
-
 	<object id="BaseKeyValueProcessor" type="Nexus.Core.Validators.KeyValueProcessor"/>
 
 </objects>

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml Tue Sep 13 13:27:50 2005
@@ -156,7 +156,7 @@
 	  <property name="FieldTable"><ref object="FieldTable"/></property>
 	  <property name="PreOp"><ref object="pre-op"/></property>
 	  <property name="PostOp"><ref object="post-op"/></property>
-	  <property name="ViewHelper"><object type="Nexus.Web.WebHelper" singleton="false"/></property>
+	  <property name="ViewHelper"><object type="Nexus.Web.WebHelper, Nexus.Web" singleton="false"/></property>
   </object>
  
 </objects>

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs Tue Sep 13 13:27:50 2005
@@ -44,7 +44,7 @@
 			IViewHelper helper = Catalog.GetHelperFor(App.ENTRY_LIST);
 			DropDownList list = sender as DropDownList;
 			string id = list.ID;
-			int v = id.LastIndexOf(helper.ListSuffix);
+			int v = id.LastIndexOf(ListSuffix);
 			string key = id.Substring(0, v);
 			helper.Criteria[key] = list.SelectedValue;
 			Filter_Reset(list);

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs Tue Sep 13 13:27:50 2005
@@ -69,7 +69,7 @@
 			IViewHelper helper = Catalog.GetHelperFor(App.ENTRY_LIST);
 			DropDownList list = sender as DropDownList;
 			string id = list.ID;
-			int v = id.LastIndexOf(helper.ListSuffix);
+			int v = id.LastIndexOf(ListSuffix);
 			string key = id.Substring(0, v);
 			helper.Criteria[key] = list.SelectedValue;
 			Filter_Reset(list);

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs Tue Sep 13 13:27:50 2005
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Web.UI.WebControls;
 using Nexus.Core.Helpers;
+using Nexus.Core.Profile;
 using PhoneBook.Core;
 
 namespace PhoneBook.Web.Controls
@@ -36,8 +37,8 @@
 			SaveCommand = App.ENTRY_SAVE;
 			DataKeyField = App.ENTRY_KEY;
 			HasItemColumn = false;
-			// AppUserProfile profile = Session[UserProfile.USER_PROFILE] as AppUserProfile;
-			HasEditColumn = true; // profile.IsEditor;
+			AppUserProfile profile = Session[UserProfile.USER_PROFILE] as AppUserProfile;
+			HasEditColumn = profile.IsEditor;
 
 			IList f = new ArrayList(7);
 			f.Add(App.LAST_NAME);

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml Tue Sep 13 13:27:50 2005
@@ -13,23 +13,6 @@
 		</property>		
 	</object>
 	
-	<!-- All child helpers must also specify singleton=false; otherwise, Context is shared. -->
-  	<object id="BaseGridHelper" type="PhoneBook.Web.AppGridHelper, PhoneBook.Web" singleton="false">
-		<property name="Catalog">
-			<ref object="Catalog" />
-		</property>
-		<property name="MessageSource">
-			<ref object="messageSource" />
-		</property>		
-	</object>
-
-	<!-- All child helpers must also specify singleton=false; otherwise, Context is shared. -->
-	<object id="BaseHelper" type="Nexus.Web.WebViewHelper, Nexus.Web" singleton="false">
-		<property name="Catalog">
-			<ref object="Catalog" />
-		</property>
-	</object>
-
 	<object id="BaseKeyValueProcessor" type="Nexus.Core.Validators.KeyValueProcessor"/>
 
 </objects>

Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj?rev=280643&r1=280642&r2=280643&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj Tue Sep 13 13:27:50 2005
@@ -134,11 +134,6 @@
         <Files>
             <Include>
                 <File
-                    RelPath = "AppGridHelper.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
                     RelPath = "AssemblyInfo.cs"
                     SubType = "Code"
                     BuildAction = "Compile"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org