gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2017-01-18 15:13:18 +01:00
commit c63f994a5f
7 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -96,10 +96,10 @@
--------------------------------------------------------------------------------
Changes in version 4.3.32
--------------------------------------------------------------------------------
- fix saving new mimetype for fulltext search, available languages
- fix saving new mimetype for fulltext search, available languages (Closes #308)
- put access rights of folder into popup box if more than 3 exists
- do not execute code which uses apache_request_headers() if it does not exists,
makes webdav work in fast cgi mode or on webservers other than apache
makes webdav work in fast cgi mode or on webservers other than apache (Closes #300)
- clean up of distribution created by makefile
- order groups in select boxes by name
- javascript added by addToFooterJS() will be written to a temp. file
@ -112,6 +112,7 @@
- replace lots of tables in forms by bootstraps control-group
- add remove button to folder selector
- editing of an exiting review/approval can be turned off
- add searching for id of folder/document (Closes #302)
--------------------------------------------------------------------------------
Changes in version 4.3.31

5
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -1239,7 +1239,7 @@ class SeedDMS_Core_DMS {
// if none is checkd search all
if (count($searchin)==0)
$searchin=array(1, 2, 3, 4);
$searchin=array(1, 2, 3, 4, 5);
/*--------- Do it all over again for folders -------------*/
$totalFolders = 0;
@ -1401,6 +1401,9 @@ class SeedDMS_Core_DMS {
$searchFields[] = "`tblDocumentAttributes`.`value`";
$searchFields[] = "`tblDocumentContentAttributes`.`value`";
}
if (in_array(5, $searchin)) {
$searchFields[] = "`tblDocuments`.`id`";
}
if (count($searchFields)>0) {

3
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -106,6 +106,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
if (in_array(4, $searchin)) {
$searchFields[] = "`tblFolderAttributes`.`value`";
}
if (in_array(5, $searchin)) {
$searchFields[] = "`tblFolders`.`id`";
}
return $searchFields;
} /* }}} */

1
SeedDMS_Core/package.xml
View File

@ -1147,6 +1147,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
<notes>
- order groups by name returned by getReadAccessList()
- add optional parameter to SeedDMS_Core_DMS::filterDocumentLinks()
- SeedDMS_Core_DMS::search() can search for document/folder id
</notes>
</release>
<release>

4
op/op.Settings.php
View File

@ -203,7 +203,7 @@ if ($action == "saveSettings")
$settings->_converters['fulltext'] = $_POST["converters"]["fulltext"];
else
$settings->_converters['fulltext'] = $_POST["converters"];
$newmimetype = preg_replace('#[^A-Za-z0-9_/+.]+#', '', $settings->_converters["fulltext"]["newmimetype"]);
$newmimetype = preg_replace('#[^A-Za-z0-9_/+.-]+#', '', $settings->_converters["fulltext"]["newmimetype"]);
if($newmimetype && trim($settings->_converters['fulltext']['newcmd']))
$settings->_converters['fulltext'][$newmimetype] = trim($settings->_converters['fulltext']['newcmd']);
unset($settings->_converters['fulltext']['newmimetype']);
@ -211,7 +211,7 @@ if ($action == "saveSettings")
if(isset($_POST["converters"]["preview"]))
$settings->_converters['preview'] = $_POST["converters"]["preview"];
$newmimetype = preg_replace('#[^A-Za-z0-9_/+.]+#', '', $settings->_converters["preview"]["newmimetype"]);
$newmimetype = preg_replace('#[^A-Za-z0-9_/+.-]+#', '', $settings->_converters["preview"]["newmimetype"]);
if($newmimetype && trim($settings->_converters['preview']['newcmd']))
$settings->_converters['preview'][$newmimetype] = trim($settings->_converters['preview']['newcmd']);
unset($settings->_converters['preview']['newmimetype']);

3
out/out.Search.php
View File

@ -194,6 +194,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
case 2: // name
case 3: // comment
case 4: // attributes
case 5: // id
$searchin[$si] = $si;
break;
}
@ -202,7 +203,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
}
// if none is checkd search all
if (count($searchin)==0) $searchin=array(1, 2, 3, 4);
if (count($searchin)==0) $searchin=array(1, 2, 3, 4, 5);
// Check to see if the search has been restricted to a particular sub-tree in
// the folder hierarchy.

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

@ -206,6 +206,7 @@ $(document).ready( function() {
<label class="checkbox" for="searchName"><input type="checkbox" name="searchin[]" id="searchName" value="2" <?php if(in_array('2', $searchin)) echo " checked"; ?>><?php printMLText("name");?></label>
<label class="checkbox" for="comment"><input type="checkbox" name="searchin[]" id="comment" value="3" <?php if(in_array('3', $searchin)) echo " checked"; ?>><?php printMLText("comment");?></label>
<label class="checkbox" for="attributes"><input type="checkbox" name="searchin[]" id="attributes" value="4" <?php if(in_array('4', $searchin)) echo " checked"; ?>><?php printMLText("attributes");?></label>
<label class="checkbox" for="id"><input type="checkbox" name="searchin[]" id="id" value="5" <?php if(in_array('5', $searchin)) echo " checked"; ?>><?php printMLText("id");?></label>
</td>
</tr>
<tr>