gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-15 09:39:17 +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-08-12 07:27:01 +02:00
commit db6456d698
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -167,8 +167,9 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- add hooks showDocumentAttribute and showDocumentContentAttribute in Search view - add hooks showDocumentAttribute and showDocumentContentAttribute in Search view
- fix layout problems of select2 menu, add option for adding an icon to each option - fix layout problems of select2 menu, add option for adding an icon to each option
- better import for users from csv file - better import of users from csv file
- fix various methods in restapi (Closes: #481) - fix various methods in restapi (Closes: #481)
- add hooks showDocumentKeywords and showDocumentCategories
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.18 Changes in version 5.1.18

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

@ -1553,8 +1553,8 @@ $(document).ready(function() {
<p>'.getMLText('keywords_loading').'</p> <p>'.getMLText('keywords_loading').'</p>
</div> </div>
<div class="modal-footer"> <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>
<button class="btn" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button> <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button>
</div> </div>
</div>'; </div>';
return $content; return $content;

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

@ -527,7 +527,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
echo "<option value=\"".$key."\""; echo "<option value=\"".$key."\"";
if(in_array($key, $selections)) if(in_array($key, $selections))
echo " selected"; echo " selected";
echo ">".htmlspecialchars($opt)."</option>"; echo ">".htmlspecialchars(getMLText($extname.'_'.$opt, array(), $opt))."</option>";
} }
echo "</select>"; echo "</select>";
} elseif(!empty($conf['internal'])) { } elseif(!empty($conf['internal'])) {
@ -619,7 +619,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
<?php <?php
if(is_writeable($settings->_configFilePath)) { if(is_writeable($settings->_configFilePath)) {
?> ?>
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button> <button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
<?php <?php
} }
?> ?>

32
views/bootstrap/class.ViewDocument.php
View File

@ -282,27 +282,47 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<?php <?php
} }
if($document->getKeywords()) { if($document->getKeywords()) {
$arr = $this->callHook('showDocumentKeywords', $document);
if(is_array($arr)) {
echo "<tr>";
echo "<td>".$arr[0].":</td>";
echo "<td>".$arr[1]."</td>";
echo "</tr>";
} elseif(is_string($arr)) {
echo $arr;
} else {
?> ?>
<tr> <tr>
<td><?php printMLText("keywords");?>:</td> <td><?php printMLText("keywords");?>:</td>
<td><?php print htmlspecialchars($document->getKeywords());?></td> <td><?php print htmlspecialchars($document->getKeywords());?></td>
</tr> </tr>
<?php <?php
}
} }
if($cats = $document->getCategories()) { if($cats = $document->getCategories()) {
$arr = $this->callHook('showDocumentCategories', $document);
if(is_array($arr)) {
echo "<tr>";
echo "<td>".$arr[0].":</td>";
echo "<td>".$arr[1]."</td>";
echo "</tr>";
} elseif(is_string($arr)) {
echo $arr;
} else {
?> ?>
<tr> <tr>
<td><?php printMLText("categories");?>:</td> <td><?php printMLText("categories");?>:</td>
<td> <td>
<?php <?php
$ct = array(); $ct = array();
foreach($cats as $cat) foreach($cats as $cat)
$ct[] = htmlspecialchars($cat->getName()); $ct[] = htmlspecialchars($cat->getName());
echo implode(', ', $ct); echo implode(', ', $ct);
?> ?>
</td> </td>
</tr> </tr>
<?php <?php
}
} }
?> ?>
<?php <?php