gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-11 20:21: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 2020-07-21 07:30:23 +02:00
commit 5ba96000c1
6 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,6 +341,8 @@ $(document).ready(function() {
foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arrs)) {
echo $arrs;
}
$this->contentSubHeading(getMLText("version_info"));
@ -411,6 +413,8 @@ $(document).ready(function() {
foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arrs)) {
echo $arrs;
}
if($workflowmode == 'advanced') {

9
views/bootstrap/class.AddSubFolder.php
View File

@ -119,6 +119,15 @@ $(document).ready( function() {
}
}
}
$arrs = $this->callHook('addFolderAttributes', $folder);
if(is_array($arrs)) {
foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arrs)) {
echo $arrs;
}
$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_subfolder'));
?>
</form>

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

@ -72,8 +72,8 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arr)) {
echo $arr;
} elseif(is_string($arrs)) {
echo $arrs;
}
$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
?>

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

@ -228,8 +228,8 @@ $(document).ready( function() {
foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arr)) {
echo $arr;
} elseif(is_string($arrs)) {
echo $arrs;
}
$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
?>

2
views/bootstrap/class.EditFolder.php
View File

@ -130,7 +130,7 @@ $(document).ready(function() {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arrs)) {
echo $arr;
echo $arrs;
}
$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
?>

2
views/bootstrap/class.UpdateDocument.php
View File

@ -316,6 +316,8 @@ console.log(element);
foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]);
}
} elseif(is_string($arrs)) {
echo $arrs;
}
if($workflowmode == 'advanced') {