gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.14' into develop

Browse Source 
Conflicts:
	SeedDMS_Core/Core/inc.ClassFolder.php
This commit is contained in:
Uwe Steinmann 2014-12-11 21:12:42 +01:00
commit 1c0a2f37b4
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 4.3.14
--------------------------------------------------------------------------------
- add missing start in transaction in SeedDMS_Core_Folder::remove()
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.13 Changes in version 4.3.13
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

28
SeedDMS_Core/package.xml
View File

@ -15,8 +15,8 @@
<date>2014-11-27</date> <date>2014-11-27</date>
<time>11:56:35</time> <time>11:56:35</time>
<version> <version>
<release>4.3.13</release> <release>4.3.14</release>
<api>4.3.13</api> <api>4.3.14</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -24,10 +24,7 @@
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- fix searching for attributes - add missing start transaction in SeedDMD_Core_Folder::remove()
- add some more documentation
- SeedDMS_Core_DMS::getDocumentCategories() returns categories sorted by name (Bug #181)
- new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version.
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">
@ -752,5 +749,24 @@ new release
- fix searching folders with multivalue attributes - fix searching folders with multivalue attributes
</notes> </notes>
</release> </release>
<release>
<date>2014-11-27</date>
<time>11:56:35</time>
<version>
<release>4.3.13</release>
<api>4.3.13</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- fix searching for attributes
- add some more documentation
- SeedDMS_Core_DMS::getDocumentCategories() returns categories sorted by name (Bug #181)
- new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version.
</notes>
</release>
</changelog> </changelog>
</package> </package>

5
out/out.ReviewDocument.php
View File

@ -25,6 +25,7 @@ include("../inc/inc.Init.php");
include("../inc/inc.Extension.php"); include("../inc/inc.Extension.php");
include("../inc/inc.DBInit.php"); include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassUI.php");
include("../inc/inc.ClassAccessOperation.php");
include("../inc/inc.Authentication.php"); include("../inc/inc.Authentication.php");
if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
@ -67,9 +68,13 @@ if(!$reviews) {
UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action")); UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
} }
/* Create object for checking access to certain operations */
$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
if($view) { if($view) {
$view->setParam('accessobject', $accessop);
$view->show(); $view->show();
exit; exit;
} }