yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
hartvig
2011-01-11 12:02:56 -01:00
parent 551bcdde2f 6f1776fb69
commit 24d5eefe38
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
umbraco/presentation/install/steps/database.ascx
View File

@@ -139,6 +139,7 @@
});
</script>
</asp:PlaceHolder>
<asp:PlaceHolder ID="installing" runat="server" Visible="false">
<!-- installing umbraco -->
<div class="tab install-tab" id="datebase-tab">

45
umbraco/presentation/install/utills/p.aspx.cs
View File

@@ -79,20 +79,31 @@ namespace umbraco.presentation.install.utills
if (m_Installer.CanConnect)
{
if (m_Installer.IsLatestVersion)
Helper.setProgress( 100, "Database is up-to-date", "");
else
{
if (m_Installer.IsEmpty)
{
Helper.setProgress( 35, "Installing tables...", "");
//do install
m_Installer.Install();
if (m_Installer.IsLatestVersion) {
Helper.setProgress( 100, "Installation completed!", "");
Helper.setProgress(90, "Refreshing content cache", "");
m_Installer = null;
library.RefreshContent();
Helper.setProgress(100, "Database is up-to-date", "");
} else {
if (m_Installer.IsEmpty) {
Helper.setProgress(35, "Installing tables...", "");
//do install
m_Installer.Install();
Helper.setProgress(100, "Installation completed!", "");
m_Installer = null;
library.RefreshContent();
return "installed";
} else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) {
Helper.setProgress(35, "Updating database tables...", "");
m_Installer.Install();
library.RefreshContent();
return "installed";
}
else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade)
@@ -100,13 +111,17 @@ namespace umbraco.presentation.install.utills
Helper.setProgress( 35, "Updating database tables...", "");
m_Installer.Install();
Helper.setProgress( 100, "Upgrade completed!", "");
Helper.setProgress(100, "Upgrade completed!", "");
m_Installer = null;
m_Installer = null;
return "upgraded";
}
library.RefreshContent();
return "upgraded";
}
}
}
return "no connection;";

2
umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js
View File

@@ -259,7 +259,7 @@ Umbraco.Application.Actions = function () {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 600, 425);
}
else if (actionNode.nodeType == "initmember") {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380);
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 480, 380);
}
else if (actionNode.nodeType == "initpython" || actionNode.nodeType == "initdlrscripting") {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380);