gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-10-27 07:09:43 +02:00
commit 40f8cd0e21
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
op/op.Settings.php
View File

@ -74,7 +74,7 @@ if ($action == "saveSettings")
$settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]); $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]);
$settings->_fullSearchEngine = $_POST["fullSearchEngine"]; $settings->_fullSearchEngine = $_POST["fullSearchEngine"];
$settings->_defaultSearchMethod = $_POST["defaultSearchMethod"]; $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
$settings->_showSingleSearchHit = $_POST["showSingleSearchHit"]; $settings->_showSingleSearchHit = getBoolValue("showSingleSearchHit");
$settings->_enableClipboard = getBoolValue("enableClipboard"); $settings->_enableClipboard = getBoolValue("enableClipboard");
$settings->_enableDropUpload = getBoolValue("enableDropUpload"); $settings->_enableDropUpload = getBoolValue("enableDropUpload");
$settings->_enableFolderTree = getBoolValue("enableFolderTree"); $settings->_enableFolderTree = getBoolValue("enableFolderTree");

15
views/bootstrap/class.AttributeMgr.php
View File

@ -76,7 +76,7 @@ $(document).ready( function() {
<div class="accordion" id="accordion1"> <div class="accordion" id="accordion1">
<div class="accordion-group"> <div class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseOne"> <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseOne">
<?php printMLText('attribute_value'); ?> <?php printMLText('attribute_value'); ?>
</a> </a>
</div> </div>
@ -89,9 +89,20 @@ $(document).ready( function() {
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th>".getMLText("attribute_value")."</th>\n"; print "<th>".getMLText("attribute_value")."</th>\n";
print "<th>".getMLText("attribute_count")."</th>\n"; print "<th>".getMLText("attribute_count")."</th>\n";
print "<th></th>\n";
print "</tr></thead>\n<tbody>\n"; print "</tr></thead>\n<tbody>\n";
foreach($res['frequencies'][$type] as $entry) { foreach($res['frequencies'][$type] as $entry) {
echo "<tr><td>".$entry['value']."</td><td>".$entry['c']."</td></tr>"; echo "<tr>";
echo "<td>".$entry['value']."</td><td>".$entry['c']."</td>";
/* various checks, if the value is valid */
echo "<td>";
/* Check if value is in value set */
if($selattrdef->getValueSet()) {
if(in_array($entry['value'], $selattrdef->getValueSetAsArray()))
printMLText("attribute_value_not_in_valueset");
}
echo "</td>";
echo "</tr>";
} }
print "</tbody></table>"; print "</tbody></table>";
} }