gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-25 02:51:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2023-01-09 16:58:39 +01:00
commit 1374c7fda3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
views/bootstrap/class.Info.php
View File

@ -35,6 +35,7 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
$dms = $this->params['dms'];
$user = $this->params['user'];
$settings = $this->params['settings'];
$httproot = $settings->_httpRoot;
$version = $this->params['version'];
$availversions = $this->params['availversions'];
$extmgr = $this->params['extmgr'];
@ -67,16 +68,21 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
echo "</th>\n";
echo "</tr>\n</thead>\n<tbody>\n";
$dbversion = $dms->getDBVersion();
echo "<tr><td></td><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
echo "<tr><td></td><td></td><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
if($user->isAdmin()) {
echo "<tr><td><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
echo "<tr><td></td><td></td><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
foreach($seedextensions as $extname=>$extconf) {
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 "</td>";
echo "<td width=\"32\">";
if($extconf['icon'])
echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
echo "</td>";
echo "<td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td>";
echo "</tr>\n";
}
}

4
views/bootstrap/class.Search.php
View File

@ -854,8 +854,8 @@ function typeahead() { /* {{{ */
}
if(!isset($facets['record_type'])) {
$options = array();
$options[] = array('document', getMLText('document'), in_array('document', $record_type));
$options[] = array('folder', getMLText('folder'), in_array('folder', $record_type));
$options[] = array('document', getMLText('document'), $record_type && in_array('document', $record_type));
$options[] = array('folder', getMLText('folder'), $record_type && in_array('folder', $record_type));
$this->formField(
getMLText("record_type"),
array(