mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-10-17 05:22:23 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
42a7644d09
|
@ -331,6 +331,9 @@ switch($command) {
|
||||||
if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
|
if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
|
||||||
if($folder->getAccessMode($user, 'moveDocument') >= M_READWRITE) {
|
if($folder->getAccessMode($user, 'moveDocument') >= M_READWRITE) {
|
||||||
if($mdocument->setFolder($folder)) {
|
if($mdocument->setFolder($folder)) {
|
||||||
|
if(isset($_REQUEST['sequence'])) {
|
||||||
|
$mdocument->setSequence((float) $_REQUEST['sequence']);
|
||||||
|
}
|
||||||
header('Content-Type: application/json');
|
header('Content-Type: application/json');
|
||||||
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_document'), 'data'=>''));
|
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_document'), 'data'=>''));
|
||||||
add_log_line();
|
add_log_line();
|
||||||
|
|
|
@ -34,6 +34,7 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
|
||||||
function show() { /* {{{ */
|
function show() { /* {{{ */
|
||||||
$dms = $this->params['dms'];
|
$dms = $this->params['dms'];
|
||||||
$user = $this->params['user'];
|
$user = $this->params['user'];
|
||||||
|
$settings = $this->params['settings'];
|
||||||
$version = $this->params['version'];
|
$version = $this->params['version'];
|
||||||
$availversions = $this->params['availversions'];
|
$availversions = $this->params['availversions'];
|
||||||
$extmgr = $this->params['extmgr'];
|
$extmgr = $this->params['extmgr'];
|
||||||
|
@ -61,15 +62,23 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
|
||||||
$seedextensions = $extmgr->getExtensionConfiguration();
|
$seedextensions = $extmgr->getExtensionConfiguration();
|
||||||
echo "<table class=\"table table-condensed table-sm\">\n";
|
echo "<table class=\"table table-condensed table-sm\">\n";
|
||||||
echo "<thead>\n<tr>\n";
|
echo "<thead>\n<tr>\n";
|
||||||
|
echo "<th></th>";
|
||||||
echo "<th>".getMLText("name");
|
echo "<th>".getMLText("name");
|
||||||
echo "</th>\n";
|
echo "</th>\n";
|
||||||
echo "</tr>\n</thead>\n<tbody>\n";
|
echo "</tr>\n</thead>\n<tbody>\n";
|
||||||
$dbversion = $dms->getDBVersion();
|
$dbversion = $dms->getDBVersion();
|
||||||
echo "<tr><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
|
echo "<tr><td></td><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
|
||||||
if($user->isAdmin()) {
|
if($user->isAdmin()) {
|
||||||
echo "<tr><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
|
echo "<tr><td><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
|
||||||
foreach($seedextensions as $extname=>$extconf)
|
foreach($seedextensions as $extname=>$extconf) {
|
||||||
echo "<tr><td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td></tr>\n";
|
echo "<tr><td>";
|
||||||
|
if(!$settings->extensionIsDisabled($extname))
|
||||||
|
echo "<i class=\"fa fa-circle text-success\"></i> ";
|
||||||
|
else
|
||||||
|
echo "<i class=\"fa fa-circle text-danger text-error\"></i> ";
|
||||||
|
echo "</td><td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td>";
|
||||||
|
echo "</tr>\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
echo "</tbody>\n</table>\n";
|
echo "</tbody>\n</table>\n";
|
||||||
$this->columnEnd();
|
$this->columnEnd();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user