gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31:32 +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-10-07 15:21:01 +02:00
commit 3f74df0ae4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -183,6 +183,7 @@
- new api to fulltext search
- do offer to export users of group if there are no users
- config file can be set in env var SEEDDMS_CONFIG_FILE
- fix error when search for a boolean attribute value
--------------------------------------------------------------------------------
Changes in version 5.1.20

13
views/bootstrap/class.Bootstrap.php
View File

@ -1407,7 +1407,7 @@ $(document).ready(function() {
<p>'.getMLText('tree_loading').'</p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
<button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
</div>
</div>
';
@ -1473,7 +1473,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
<p>'.getMLText('tree_loading').'</p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
<button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
</div>
</div>
';
@ -1570,8 +1570,8 @@ $(document).ready(function() {
<p><?php printMLText('categories_loading') ?></p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
<button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
<button class="btn" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
</div>
</div>
<?php
@ -1705,8 +1705,9 @@ $(document).ready(function() {
$content = '';
switch($attrdef->getType()) {
case SeedDMS_Core_AttributeDefinition::type_boolean:
$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
break;
case SeedDMS_Core_AttributeDefinition::type_date:
$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
@ -1837,7 +1838,7 @@ $(document).ready(function() {
<p>'.getMLText('files_loading').'</p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
<button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
</div>
</div>
';