Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust for backup index page.

Browse Source
This commit is contained in:
wangyidong
2023-07-26 18:26:35 +08:00
parent f89f502bd1
commit 1cc8baf78b
6 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/backup/control.php
+6 -24
View File
@@ -97,14 +97,8 @@ class backup extends control
if(!$result->result)
{
if($reload == 'yes')
{
return print(sprintf($this->lang->backup->error->noWritable, $this->backupPath));
}
else
{
printf($this->lang->backup->error->noWritable, $this->backupPath);
}
if($reload == 'yes') return print(sprintf($this->lang->backup->error->noWritable, $this->backupPath));
printf($this->lang->backup->error->noWritable, $this->backupPath);
}
if(!$nosafe) $this->backup->addFileHeader($backFileName);
@@ -116,14 +110,8 @@ class backup extends control
if(!$result->result)
{
if($reload == 'yes')
{
return print(sprintf($this->lang->backup->error->backupFile, $result->error));
}
else
{
printf($this->lang->backup->error->backupFile, $result->error);
}
if($reload == 'yes') return print(sprintf($this->lang->backup->error->backupFile, $result->error));
printf($this->lang->backup->error->backupFile, $result->error);
}
$backFileName = "{$this->backupPath}{$fileName}.code";
@@ -131,14 +119,8 @@ class backup extends control
$result = $this->backup->backCode($backFileName);
if(!$result->result)
{
if($reload == 'yes')
{
return print(sprintf($this->lang->backup->error->backupCode, $result->error));
}
else
{
printf($this->lang->backup->error->backupCode, $result->error);
}
if($reload == 'yes') return print(sprintf($this->lang->backup->error->backupCode, $result->error));
printf($this->lang->backup->error->backupCode, $result->error);
}
}
module/backup/js/index.ui.js
+1 -2
View File
@@ -6,12 +6,11 @@ window.backup = function(e)
onComplete: function(data)
{
clearInterval(timeID);
$('#waiting .modal-body #message').append(data);
setTimeout(function()
{
return loadCurrentPage();
location.href = $.createLink('backup', 'index');
}, 2000);
},
});
module/backup/ui/index.html.php
+1
View File
@@ -100,6 +100,7 @@ dtable
set::data($rows),
set::plugins(array('cellspan')),
set::getCellSpan(jsRaw('window.getCellSpan')),
set::footer(array('html' => $lang->backup->restoreTip . sprintf($lang->backup->holdDays, $config->backup->holdDays), 'className' => 'text-important')),
);
modalTrigger
module/backup/ui/setting.html.php
+1 -1
View File
@@ -42,7 +42,7 @@ else
input
(
set::name('settingDir'),
set::value(!empty($config->backup->settingDir) ? $config->backup->settingDir : $this->app->getTmpRoot()),
set::value(!empty($config->backup->settingDir) ? $config->backup->settingDir : $this->app->getTmpRoot() . 'backup/'),
)
)
),
module/story/zen.php
+1 -1
View File
@@ -1017,7 +1017,7 @@ class storyZen extends story
protected function responseAfterCreateInModal(string $message, int $executionID = 0): array|false
{
if(!isonlybody()) return false;
if($this->app->tab != 'execution') return array('result' => 'success', 'message' => $message, 'load' => true, 'closedModal' => true);
if($this->app->tab != 'execution') return array('result' => 'success', 'message' => $message, 'load' => true, 'closeModal' => true);
$executionID = $executionID ? $executionID : $this->session->execution;
$execution = $this->execution->getByID($executionID);
module/user/css/login.ui.css
+1
View File
@@ -1,4 +1,5 @@
body {background: #1183fb linear-gradient(-90deg, #0a48d1 0%, #1183fb 100%); background-color: #1183fb;}
#main {min-height:0px;}
#login {max-width: 600px !important; margin: 0 auto; margin-top: 5%; padding: 0 48px;}
#loginPanel {background: #fff; overflow: hidden; box-shadow: 0 0 20px 0 rgba(0,0,0,.1); border-radius: 3px;}
#loginPanel > .header {padding: 20px; border-bottom: 1px #eee solid; position: relative;}