summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-05-15 14:28:28 +0200
committerGitHub <noreply@github.com>2017-05-15 14:28:28 +0200
commit8e7cff2eac4e75eaac43911ec785a42b1f815561 (patch)
tree27bfacb929fcae7508029efa76a5e69cf5661717 /core
parentbf0d966c7ac11e010f3ee45d0a2ad821b40e5fc2 (diff)
parent3fa604cc5edad8efae30cb33b13e3a23ee2494fd (diff)
downloadnextcloud-server-8e7cff2eac4e75eaac43911ec785a42b1f815561.tar.gz
nextcloud-server-8e7cff2eac4e75eaac43911ec785a42b1f815561.zip
Merge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances
Allow to enforce update via web UI
Diffstat (limited to 'core')
-rw-r--r--core/css/guest.css14
-rw-r--r--core/templates/update.use-cli.php9
2 files changed, 23 insertions, 0 deletions
diff --git a/core/css/guest.css b/core/css/guest.css
index fa5bdfe5e99..657a4adbdef 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -178,6 +178,17 @@ input.updateButton,
input.update-continue {
padding: 10px 20px; /* larger log in and installation buttons */
}
+.updateAnyways a.updateAnywaysButton {
+ font-size: 14px;
+ padding: 10px 20px;
+ color: #666 !important;
+ display: inline-block;
+ border-radius: 3px;
+ margin: 15px 5px;
+}
+.updateAnyways a.updateAnywaysButton:hover {
+ color: #222 !important;
+}
input.primary,
button.primary {
border: 1px solid #0082c9;
@@ -442,6 +453,9 @@ form #selectDbType label.ui-state-active {
border-radius: 3px;
cursor: default;
}
+.warning.updateAnyways {
+ text-align: center;
+}
.warning legend,
.warning a,
.error a {
diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php
index 9fbdbca8b21..d30e15c8573 100644
--- a/core/templates/update.use-cli.php
+++ b/core/templates/update.use-cli.php
@@ -11,4 +11,13 @@
print_unescaped($l->t('For help, see the <a target="_blank" rel="noreferrer" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
</div>
</div>
+
+ <?php if ($_['tooBig']) { ?>
+ <div class="warning updateAnyways">
+ <?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?>
+ <a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a>
+ </div>
+ <?php } ?>
+
+
</div>