Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [260] Deploy
|
From: <m_h...@us...> - 2006-08-02 01:37:30
|
Revision: 260 Author: m_hildebrand Date: 2006-08-01 18:37:18 -0700 (Tue, 01 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=260&view=rev Log Message: ----------- I don't remember. Sorry. Modified Paths: -------------- Website/App_Code/Common.cs Website/App_Code/Products.cs Website/App_Code/tcdbDataSet.xsd Website/App_Code/tcdbDataSet.xss Website/Includes/AdministrationTree.ascx.cs Website/Includes/Authenticate.ascx.cs Website/Includes/Roles.ascx Website/Includes/Roles.ascx.cs Property Changed: ---------------- Deploy/ Website/ Property changes on: Deploy ___________________________________________________________________ Name: svn:ignore - *.suo TCDB_2006.msi setup.exe + *.suo TCDB_2006.msi setup.exe TCDB_2006 1.0.0 Alpha 2.msi Property changes on: Website ___________________________________________________________________ Name: svn:ignore - App_Data tcdb2006.log licenses.licx tcdb2006.log.3 + App_Data tcdb2006.log licenses.licx tcdb2006.log.3 tcdb2006.log.1 Modified: Website/App_Code/Common.cs =================================================================== --- Website/App_Code/Common.cs 2006-08-01 22:41:20 UTC (rev 259) +++ Website/App_Code/Common.cs 2006-08-02 01:37:18 UTC (rev 260) @@ -1113,18 +1113,21 @@ public static void SaveConfigString(int userID, String name, String value) { - tcdbDataSetTableAdapters.db_configTableAdapter configAdapter = new tcdbDataSetTableAdapters.db_configTableAdapter(); - tcdbDataSet.db_configDataTable configTable = configAdapter.GetData(userID, name); + if (Constants.IS_DEV_ENV) + { + tcdbDataSetTableAdapters.db_configTableAdapter configAdapter = new tcdbDataSetTableAdapters.db_configTableAdapter(); + tcdbDataSet.db_configDataTable configTable = configAdapter.GetData(userID, name); - if (configTable.Count > 0) - { - configTable[0].value = value; - configAdapter.Update(configTable[0]); + if (configTable.Count > 0) + { + configTable[0].value = value; + configAdapter.Update(configTable[0]); + } + else + { + configAdapter.Insert(userID, name, value); + } } - else - { - configAdapter.Insert(userID, name, value); - } } public static void SaveConfigBool(int userID, String name, Boolean value) { Modified: Website/App_Code/Products.cs =================================================================== --- Website/App_Code/Products.cs 2006-08-01 22:41:20 UTC (rev 259) +++ Website/App_Code/Products.cs 2006-08-02 01:37:18 UTC (rev 260) @@ -39,14 +39,9 @@ string name = Help.DB_StringParse(dr["name"]); string description = Help.DB_StringParse(dr["description"]); string codeName = Help.DB_StringParse(dr["codeName"]); - User devManager = UserDB.GetUserInfo(Help.DB_IntParse(dr["devManager"])); - User qaManager = UserDB.GetUserInfo(Help.DB_IntParse(dr["qaManager"])); - User devLead = UserDB.GetUserInfo(Help.DB_IntParse(dr["devLead"])); - User qaLead = UserDB.GetUserInfo(Help.DB_IntParse(dr["qaLead"])); - User pm = UserDB.GetUserInfo(Help.DB_IntParse(dr["pm"])); bool active = Help.DB_BoolParse(dr["active"]); - product = new Product(id, name, description, codeName, devManager, qaManager, devLead, qaLead, pm, active); + product = new Product(id, name, description, codeName, active); } return product; @@ -68,11 +63,6 @@ string name; string description; string codeName; - User devManager; - User qaManager; - User devLead; - User qaLead; - User pm; bool active; while (dr.Read()) { @@ -82,14 +72,9 @@ name = Help.DB_StringParse(dr["name"]); description = Help.DB_StringParse(dr["description"]); codeName = Help.DB_StringParse(dr["codeName"]); - devManager = UserDB.GetUserInfo(Help.DB_IntParse(dr["devManager"])); - qaManager = UserDB.GetUserInfo(Help.DB_IntParse(dr["qaManager"])); - devLead = UserDB.GetUserInfo(Help.DB_IntParse(dr["devLead"])); - qaLead = UserDB.GetUserInfo(Help.DB_IntParse(dr["qaLead"])); - pm = UserDB.GetUserInfo(Help.DB_IntParse(dr["pm"])); active = Help.DB_BoolParse(dr["active"]); - product = new Product(id, name, description, codeName, devManager, qaManager, devLead, qaLead, pm, active); + product = new Product(id, name, description, codeName, active); productList.Add(product); } } @@ -104,11 +89,6 @@ private string p_name; private string p_description; private string p_codeName; - private User p_devManager; - private User p_qaManager; - private User p_devLead; - private User p_qaLead; - private User p_pm; private bool p_active; // TODO: Implement these as the time is right //private List<TCDB_Tag> tags; @@ -119,26 +99,15 @@ p_name = null; p_description = null; p_codeName = null; - p_devManager = null; - p_qaManager = null; - p_devLead = null; - p_qaLead = null; - p_pm = null; p_active = false; } - public Product(int id, string name, string description, string codeName, User devManager, - User qaManager, User devLead, User qaLead, User pm, bool active) + public Product(int id, string name, string description, string codeName, bool active) { p_productid = id; p_name = name; p_description = description; p_codeName = codeName; - p_devManager = devManager; - p_qaManager = qaManager; - p_devLead = devLead; - p_qaLead = qaLead; - p_pm = pm; p_active = active; } @@ -166,36 +135,6 @@ set { p_codeName = value; } } - public User DEVMANAGER - { - get { return p_devManager; } - set { p_devManager = value; } - } - - public User QAMANAGER - { - get { return p_qaManager; } - set { p_qaManager = value; } - } - - public User DEVLEAD - { - get { return p_devLead; } - set { p_devLead = value; } - } - - public User QALEAD - { - get { return p_qaLead; } - set { p_qaLead = value; } - } - - public User PM - { - get { return p_pm; } - set { p_pm = value; } - } - public bool ACTIVE { get { return p_active; } Modified: Website/App_Code/tcdbDataSet.xsd =================================================================== --- Website/App_Code/tcdbDataSet.xsd 2006-08-01 22:41:20 UTC (rev 259) +++ Website/App_Code/tcdbDataSet.xsd 2006-08-02 01:37:18 UTC (rev 260) @@ -632,65 +632,6 @@ <Sources> </Sources> </TableAdapter> - <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_roleTableAdapter" GeneratorDataComponentClassName="db_roleTableAdapter" Name="db_role" UserDataComponentName="db_roleTableAdapter"> - <MainSource> - <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_role" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> - <InsertCommand> - <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> - <CommandText>dbo.ins_role</CommandText> - <Parameters> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="roleName" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleDescription" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="roleDescription" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - </Parameters> - </DbCommand> - </InsertCommand> - <SelectCommand> - <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> - <CommandText>dbo.sel_role</CommandText> - <Parameters> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@roleID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - </Parameters> - </DbCommand> - </SelectCommand> - <UpdateCommand> - <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> - <CommandText>dbo.upd_role</CommandText> - <Parameters> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@roleID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="roleID" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="roleName" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleDescription" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="roleDescription" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="active" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> - </Parameters> - </DbCommand> - </UpdateCommand> - </DbSource> - </MainSource> - <Mappings> - <Mapping SourceColumn="roleID" DataSetColumn="roleID" /> - <Mapping SourceColumn="roleName" DataSetColumn="roleName" /> - <Mapping SourceColumn="roleDescription" DataSetColumn="roleDescription" /> - <Mapping SourceColumn="active" DataSetColumn="active" /> - </Mappings> - <Sources> - </Sources> - </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_roleProductUserTableAdapter" GeneratorDataComponentClassName="db_roleProductUserTableAdapter" Name="db_roleProductUser" UserDataComponentName="db_roleProductUserTableAdapter"> <MainSource> <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_roleProductUser" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> @@ -932,6 +873,65 @@ <Sources> </Sources> </TableAdapter> + <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_roleTableAdapter" GeneratorDataComponentClassName="db_roleTableAdapter" Name="db_role" UserDataComponentName="db_roleTableAdapter"> + <MainSource> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_role" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <InsertCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.ins_role</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="roleName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleDescription" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="roleDescription" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </InsertCommand> + <SelectCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.sel_role</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@roleID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + <UpdateCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.upd_role</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@roleID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="roleID" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleName" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="roleName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@roleDescription" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="roleDescription" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="active" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </UpdateCommand> + </DbSource> + </MainSource> + <Mappings> + <Mapping SourceColumn="roleID" DataSetColumn="roleID" /> + <Mapping SourceColumn="roleName" DataSetColumn="roleName" /> + <Mapping SourceColumn="roleDescription" DataSetColumn="roleDescription" /> + <Mapping SourceColumn="active" DataSetColumn="active" /> + </Mappings> + <Sources> + </Sources> + </TableAdapter> </Tables> <Sources> </Sources> @@ -1291,28 +1291,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="db_role" msprop:Generator_UserTableName="db_role" msprop:Generator_RowDeletedName="db_roleRowDeleted" msprop:Generator_RowChangedName="db_roleRowChanged" msprop:Generator_RowClassName="db_roleRow" msprop:Generator_RowChangingName="db_roleRowChanging" msprop:Generator_RowEvArgName="db_roleRowChangeEvent" msprop:Generator_RowEvHandlerName="db_roleRowChangeEventHandler" msprop:Generator_TableClassName="db_roleDataTable" msprop:Generator_TableVarName="tabledb_role" msprop:Generator_RowDeletingName="db_roleRowDeleting" msprop:Generator_TablePropName="db_role"> - <xs:complexType> - <xs:sequence> - <xs:element name="roleID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="roleID" msprop:Generator_ColumnVarNameInTable="columnroleID" msprop:Generator_ColumnPropNameInRow="roleID" msprop:Generator_ColumnPropNameInTable="roleIDColumn" type="xs:int" /> - <xs:element name="roleName" msprop:Generator_UserColumnName="roleName" msprop:Generator_ColumnVarNameInTable="columnroleName" msprop:Generator_ColumnPropNameInRow="roleName" msprop:Generator_ColumnPropNameInTable="roleNameColumn" minOccurs="0"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:maxLength value="255" /> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="roleDescription" msprop:Generator_UserColumnName="roleDescription" msprop:Generator_ColumnVarNameInTable="columnroleDescription" msprop:Generator_ColumnPropNameInRow="roleDescription" msprop:Generator_ColumnPropNameInTable="roleDescriptionColumn" minOccurs="0"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:maxLength value="2147483647" /> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="db_roleProductUser" msprop:Generator_UserTableName="db_roleProductUser" msprop:Generator_RowDeletedName="db_roleProductUserRowDeleted" msprop:Generator_RowChangedName="db_roleProductUserRowChanged" msprop:Generator_RowClassName="db_roleProductUserRow" msprop:Generator_RowChangingName="db_roleProductUserRowChanging" msprop:Generator_RowEvArgName="db_roleProductUserRowChangeEvent" msprop:Generator_RowEvHandlerName="db_roleProductUserRowChangeEventHandler" msprop:Generator_TableClassName="db_roleProductUserDataTable" msprop:Generator_TableVarName="tabledb_roleProductUser" msprop:Generator_RowDeletingName="db_roleProductUserRowDeleting" msprop:Generator_TablePropName="db_roleProductUser"> <xs:complexType> <xs:sequence> @@ -1436,6 +1414,28 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="db_role" msprop:Generator_UserTableName="db_role" msprop:Generator_RowDeletedName="db_roleRowDeleted" msprop:Generator_RowChangedName="db_roleRowChanged" msprop:Generator_RowClassName="db_roleRow" msprop:Generator_RowChangingName="db_roleRowChanging" msprop:Generator_RowEvArgName="db_roleRowChangeEvent" msprop:Generator_RowEvHandlerName="db_roleRowChangeEventHandler" msprop:Generator_TableClassName="db_roleDataTable" msprop:Generator_TableVarName="tabledb_role" msprop:Generator_RowDeletingName="db_roleRowDeleting" msprop:Generator_TablePropName="db_role"> + <xs:complexType> + <xs:sequence> + <xs:element name="roleID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="roleID" msprop:Generator_ColumnVarNameInTable="columnroleID" msprop:Generator_ColumnPropNameInRow="roleID" msprop:Generator_ColumnPropNameInTable="roleIDColumn" type="xs:int" /> + <xs:element name="roleName" msprop:Generator_UserColumnName="roleName" msprop:Generator_ColumnVarNameInTable="columnroleName" msprop:Generator_ColumnPropNameInRow="roleName" msprop:Generator_ColumnPropNameInTable="roleNameColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="255" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="roleDescription" msprop:Generator_UserColumnName="roleDescription" msprop:Generator_ColumnVarNameInTable="columnroleDescription" msprop:Generator_ColumnPropNameInRow="roleDescription" msprop:Generator_ColumnPropNameInTable="roleDescriptionColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="2147483647" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:choice> </xs:complexType> <xs:unique name="Constraint1" msdata:PrimaryKey="true"> Modified: Website/App_Code/tcdbDataSet.xss =================================================================== --- Website/App_Code/tcdbDataSet.xss 2006-08-01 22:41:20 UTC (rev 259) +++ Website/App_Code/tcdbDataSet.xss 2006-08-02 01:37:18 UTC (rev 260) @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. </autogenerated>--> -<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="269" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> +<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="239" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <Shapes> <Shape ID="DesignTable:db_users" ZOrder="17" X="87" Y="57" Height="241" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> <Shape ID="DesignTable:db_products" ZOrder="16" X="25" Y="506" Height="241" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> @@ -16,13 +16,13 @@ <Shape ID="DesignTable:db_config" ZOrder="10" X="382" Y="203" Height="156" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> <Shape ID="DesignTable:db_version" ZOrder="9" X="268" Y="539" Height="173" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="126" /> <Shape ID="DesignTable:db_rights" ZOrder="8" X="599" Y="657" Height="156" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> - <Shape ID="DesignTable:db_role" ZOrder="7" X="319" Y="763" Height="139" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:db_roleProductUser" ZOrder="6" X="903" Y="671" Height="156" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> - <Shape ID="DesignTable:db_roleProduct" ZOrder="5" X="904" Y="843" Height="105" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" /> - <Shape ID="DesignTable:db_roleUserProduct" ZOrder="4" X="593" Y="838" Height="190" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> - <Shape ID="DesignTable:db_roleRight" ZOrder="3" X="61" Y="768" Height="173" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:db_userRights" ZOrder="2" X="647" Y="158" Height="190" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="143" /> - <Shape ID="DesignTable:db_rightRole" ZOrder="1" X="272" Y="942" Height="139" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:db_roleProductUser" ZOrder="7" X="903" Y="671" Height="156" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> + <Shape ID="DesignTable:db_roleProduct" ZOrder="6" X="904" Y="843" Height="105" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" /> + <Shape ID="DesignTable:db_roleUserProduct" ZOrder="5" X="593" Y="838" Height="190" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> + <Shape ID="DesignTable:db_roleRight" ZOrder="4" X="61" Y="768" Height="173" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:db_userRights" ZOrder="3" X="647" Y="158" Height="190" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="143" /> + <Shape ID="DesignTable:db_rightRole" ZOrder="2" X="272" Y="942" Height="139" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:db_role" ZOrder="1" X="306" Y="769" Height="139" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> </Shapes> <Connectors /> </DiagramLayout> \ No newline at end of file Modified: Website/Includes/AdministrationTree.ascx.cs =================================================================== --- Website/Includes/AdministrationTree.ascx.cs 2006-08-01 22:41:20 UTC (rev 259) +++ Website/Includes/AdministrationTree.ascx.cs 2006-08-02 01:37:18 UTC (rev 260) @@ -74,16 +74,20 @@ ArrayList nodes = (ArrayList)Session["AdminNodes"]; TreeNode newNode; + // Add Admin Settings - newNode = new TreeNode(); - newNode.Text = "Site Settings"; - newNode.Value = "admin"; - newNode.PopulateOnDemand = true; - newNode.SelectAction = TreeNodeSelectAction.Expand; - newNode.NavigateUrl = "~/AdminConfig.aspx"; - parent.ChildNodes.Add(newNode); - if (nodes.Contains(newNode.ValuePath)) - newNode.Expand(); + if (Constants.IS_DEV_ENV) + { + newNode = new TreeNode(); + newNode.Text = "Site Settings"; + newNode.Value = "admin"; + newNode.PopulateOnDemand = true; + newNode.SelectAction = TreeNodeSelectAction.Expand; + newNode.NavigateUrl = "~/AdminConfig.aspx"; + parent.ChildNodes.Add(newNode); + if (nodes.Contains(newNode.ValuePath)) + newNode.Expand(); + } // Users newNode = new TreeNode(); Modified: Website/Includes/Authenticate.ascx.cs =================================================================== --- Website/Includes/Authenticate.ascx.cs 2006-08-01 22:41:20 UTC (rev 259) +++ Website/Includes/Authenticate.ascx.cs 2006-08-02 01:37:18 UTC (rev 260) @@ -200,8 +200,9 @@ private User GetProductAdmin(Product product) { - User admin; - + // TODO: FIX THIS CODE!!!!! It needs to look up the product admin by role now + User admin = new User(); + /* if (product.QALEAD.HasRight(Constants.RIGHTS_ASSIGNPERMISSION, product.ID)) { m_logg.Debug("The QA lead [" + product.QALEAD.ToString() + "] has rights to assign permissions for product [" + product.ToString() + "]"); @@ -221,7 +222,7 @@ admin = UserDB.GetUserInfo(ConfigDB.GetConfigInt("site_admin")); m_logg.Debug("The site admin [" + admin.ToString() + "] has rights to assign permissions for product [" + product.ToString() + "]"); } - + */ return admin; } } Modified: Website/Includes/Roles.ascx =================================================================== --- Website/Includes/Roles.ascx 2006-08-01 22:41:20 UTC (rev 259) +++ Website/Includes/Roles.ascx 2006-08-02 01:37:18 UTC (rev 260) @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="Roles.ascx.cs" Inherits="Roles" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="Roles.ascx.cs" Inherits="TCDBRoles" %> <%@ Register Assembly="FreeTextBox" Namespace="FreeTextBoxControls" TagPrefix="FTB" %> <asp:FormView ID="FormView1" runat="server" DataKeyNames="roleID" DataSourceID="RoleDataSource" OnItemInserted="FormView1_ItemInserted" OnItemUpdated="FormView1_ItemUpdated" Modified: Website/Includes/Roles.ascx.cs =================================================================== --- Website/Includes/Roles.ascx.cs 2006-08-01 22:41:20 UTC (rev 259) +++ Website/Includes/Roles.ascx.cs 2006-08-02 01:37:18 UTC (rev 260) @@ -17,9 +17,9 @@ using TCDB.Rights; using log4net; -public partial class Roles : SiteUserControl +public partial class TCDBRoles : SiteUserControl { - private static ILog m_logg = LogManager.GetLogger("Page:Roles"); + private static ILog m_logg = LogManager.GetLogger("Page:TCDBRoles"); int roleID = Convert.ToInt32(HttpContext.Current.Request.QueryString[Constants.CODE_ROLE]); Role role; String mode = HttpContext.Current.Request.QueryString["mode"]; @@ -41,7 +41,7 @@ Session.Add("roleID", roleID); role = RightDB.GetRoleInfo(roleID); - Session.Add("tableName", "tcdb_role"); + //Session.Add("tableName", "tcdb_role"); if (mode == "new") FormView1.ChangeMode(FormViewMode.Insert); @@ -129,11 +129,13 @@ updateUserRoleProducts(); updateRoleRights(); + Session.Remove("tableName"); Response.Redirect("~/Role.aspx?" + Constants.CODE_ROLE + "=" + roleID); } else { m_logg.Error("Could not insert role: " + e.Values["roleName"]); + Session.Remove("tableName"); Response.Redirect("~/Administration.aspx"); } } @@ -141,19 +143,23 @@ { updateUserRoleProducts(); updateRoleRights(); + Session.Remove("tableName"); Response.Redirect("~/Role.aspx?" + Constants.CODE_ROLE + "=" + roleID); } protected void deleteCmd(object sender, CommandEventArgs e) { tcdbDataSetTableAdapters.db_roleTableAdapter rAdapter = new tcdbDataSetTableAdapters.db_roleTableAdapter(); rAdapter.Update(roleID, role.NAME, role.DESCRIPTION, false); - + Session.Remove("tableName"); Response.Redirect("~/Administration.aspx"); } protected void FormView1_ItemCommand(object sender, FormViewCommandEventArgs e) { if (FormView1.CurrentMode == FormViewMode.Insert && e.CommandName == "Cancel") + { + Session.Remove("tableName"); Response.Redirect("~/Administration.aspx"); + } } protected void userList_DataBound(object sender, EventArgs e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
