From: Jaben C. <ja...@us...> - 2007-03-09 12:15:19
|
Update of /cvsroot/yafdotnet/yafsrc/install In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8174/install Modified Files: default.aspx.cs procedures.sql Log Message: fixes Index: default.aspx.cs =================================================================== RCS file: /cvsroot/yafdotnet/yafsrc/install/default.aspx.cs,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** default.aspx.cs 26 Jan 2007 12:13:22 -0000 1.38 --- default.aspx.cs 9 Mar 2007 12:14:25 -0000 1.39 *************** *** 59,65 **** { if ( IsInstalled ) ! InstallWizard.ActiveStepIndex = 1; else ! InstallWizard.ActiveStepIndex = 0; TimeZones.DataSource = yaf_StaticData.TimeZones(); --- 59,65 ---- { if ( IsInstalled ) ! InstallWizard.ActiveStepIndex = 1; else ! InstallWizard.ActiveStepIndex = 0; TimeZones.DataSource = yaf_StaticData.TimeZones(); *************** *** 90,97 **** void Wizard_ActiveStepChanged( object sender, EventArgs e ) { ! if (InstallWizard.ActiveStepIndex == 1 && !IsInstalled) ! InstallWizard.ActiveStepIndex++; ! else if (InstallWizard.ActiveStepIndex == 3 && IsForumInstalled) ! InstallWizard.ActiveStepIndex++; } --- 90,97 ---- void Wizard_ActiveStepChanged( object sender, EventArgs e ) { ! if ( InstallWizard.ActiveStepIndex == 1 && !IsInstalled ) ! InstallWizard.ActiveStepIndex++; ! else if ( InstallWizard.ActiveStepIndex == 3 && IsForumInstalled ) ! InstallWizard.ActiveStepIndex++; } *************** *** 166,173 **** { this.Load += new System.EventHandler( this.Page_Load ); ! InstallWizard.NextButtonClick += new WizardNavigationEventHandler(Wizard_NextButtonClick); ! InstallWizard.PreviousButtonClick += new WizardNavigationEventHandler(Wizard_PreviousButtonClick); ! InstallWizard.ActiveStepChanged += new EventHandler(Wizard_ActiveStepChanged); ! InstallWizard.FinishButtonClick += new WizardNavigationEventHandler(Wizard_FinishButtonClick); base.OnInit( e ); } --- 166,173 ---- { this.Load += new System.EventHandler( this.Page_Load ); ! InstallWizard.NextButtonClick += new WizardNavigationEventHandler( Wizard_NextButtonClick ); ! InstallWizard.PreviousButtonClick += new WizardNavigationEventHandler( Wizard_PreviousButtonClick ); ! InstallWizard.ActiveStepChanged += new EventHandler( Wizard_ActiveStepChanged ); ! InstallWizard.FinishButtonClick += new WizardNavigationEventHandler( Wizard_FinishButtonClick ); base.OnInit( e ); } Index: procedures.sql =================================================================== RCS file: /cvsroot/yafdotnet/yafsrc/install/procedures.sql,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** procedures.sql 7 Mar 2007 11:58:59 -0000 1.9 --- procedures.sql 9 Mar 2007 12:14:25 -0000 1.10 *************** *** 951,956 **** declare @UserFlags int ! SET @TimeZone = (SELECT CAST(Value as int) FROM yaf_Registry WHERE LOWER(Name) = LOWER('TimeZone')) ! SET @ForumEmail = (SELECT Value FROM yaf_Registry WHERE LOWER(Name) = LOWER('ForumEmail')) -- yaf_Board --- 951,956 ---- declare @UserFlags int ! SET @TimeZone = (SELECT CAST(CAST([Value] as nvarchar(50)) as int) FROM yaf_Registry WHERE LOWER([Name]) = LOWER('TimeZone')) ! SET @ForumEmail = (SELECT CAST([Value] as nvarchar(50)) FROM yaf_Registry WHERE LOWER([Name]) = LOWER('ForumEmail')) -- yaf_Board *************** *** 3074,3085 **** GO ! create procedure [dbo].[yaf_system_updateversion]( @Version int, @VersionName nvarchar(50) ! ) as ! begin ! EXEC yaf_registry_save 'Version', @Version EXEC yaf_registry_save 'VersionName',@VersionName ! end GO --- 3074,3091 ---- GO ! CREATE PROCEDURE [dbo].[yaf_system_updateversion] ! ( @Version int, @VersionName nvarchar(50) ! ) ! AS ! BEGIN ! ! DECLARE @tmpValue AS nvarchar(100) ! SET @tmpValue = CAST(@Version AS nvarchar(100)) ! EXEC yaf_registry_save 'Version', @tmpValue EXEC yaf_registry_save 'VersionName',@VersionName ! ! END GO |