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

This commit is contained in:
Uwe Steinmann 2015-12-09 21:49:37 +01:00
commit 17ecf8e2f0
3 changed files with 7 additions and 1 deletions

View File

@ -3,6 +3,9 @@
--------------------------------------------------------------------------------
- send notification if document is delete to those users watching the folder
- fix editing of customer attributes of type checkbox
- disallow read access for group didn't prevent the users from being selected
as a reviewer/approver
- move the last bits of plain sql code from op/*.php into the core
--------------------------------------------------------------------------------
Changes in version 4.3.22

View File

@ -16,6 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Version.php");
include("../inc/inc.Settings.php");
include("../inc/inc.LogInit.php");
include("../inc/inc.Language.php");
@ -29,7 +30,8 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
$dump_name = $settings->_contentDir.time().".sql";
$v = new SeedDMS_Version;
$dump_name = $settings->_contentDir.date('Y-m-d\TH:i:s')."_".$v->_number.".sql";
if(!$dms->createDump($dump_name))
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));

View File

@ -113,6 +113,7 @@ else {
*/
$emailUserList = array();
$emailUserList[] = $version->_userID;
$emailGroupList = array();
$status = $version->getReviewStatus();
foreach ($status as $st) {
if ($st["status"]==0 && !in_array($st["required"], $emailUserList)) {