diff --git a/fileManager b/fileManager
new file mode 160000
index 000000000..dfef74d13
--- /dev/null
+++ b/fileManager
@@ -0,0 +1 @@
+Subproject commit dfef74d13c394c5507e48d5b41390992e9108745
diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php
index fb05e178a..caeb99c36 100644
--- a/workflow/engine/methods/appFolder/appFolderAjax.php
+++ b/workflow/engine/methods/appFolder/appFolderAjax.php
@@ -112,7 +112,10 @@ function delete()
break;
}
$msgLabel= G::LoadTranslation('ID_DELETED_SUCCESSFULLY');
- echo "{action: '', error:'error',message: '$msgLabel', success: 'success',folderUID: 'root'}";
+ $res ['success'] = true;
+ $res ['message'] = $msgLabel;
+ $res ['folderUID'] = 'root';
+ echo G::json_encode($res);
}
/**
@@ -265,8 +268,8 @@ function expandNode()
$tempTree ['type'] = "Directory";
$tempTree ['is_file'] = false;
$tempTree ['appDocCreateDate'] = $obj['FOLDER_CREATE_DATE'];
- $tempTree ['qtip'] = 'Directory: ' . $obj['FOLDER_NAME'] .
- '
Create Date: ' . $obj['FOLDER_CREATE_DATE'] . '';
+ // $tempTree ['qtip'] = 'Directory: ' . $obj['FOLDER_NAME'] .
+ // '
Create Date: ' . $obj['FOLDER_CREATE_DATE'] . '';
$tempTree ['is_writable'] = true;
$tempTree ['is_chmodable'] = true;
$tempTree ['is_readable'] = true;
diff --git a/workflow/engine/methods/cases/casesStartPage.php b/workflow/engine/methods/cases/casesStartPage.php
index ce56ef1b5..17a836c3d 100644
--- a/workflow/engine/methods/cases/casesStartPage.php
+++ b/workflow/engine/methods/cases/casesStartPage.php
@@ -18,8 +18,7 @@ switch ($page) {
$oHeadPublisher->assign('FORMATS', $c->getFormats());
$oHeadPublisher->assign('isIE', Bootstrap::isIE());
break;
- case "documents":
-
+ case "documentsvx":
$c = new Configurations();
$configPage = $c->getConfiguration('documentsModule', 'pageSize', '', $_SESSION['USER_LOGGED']);
$configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
@@ -34,6 +33,30 @@ switch ($page) {
$oHeadPublisher->addExtJsScript('cases/casesDocuments', false); //adding a javascript file .js
$oHeadPublisher->addContent('cases/casesDocuments'); //adding a html file .html.
break;
+ case "documents":
+ $c = new Configurations();
+ $configPage = $c->getConfiguration('documentsModule', 'pageSize', '', $_SESSION['USER_LOGGED']);
+ $configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
+ $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+ $oHeadPublisher->assign('CONFIG', $Config);
+ $oHeadPublisher->assign('FORMATS', $c->getFormats());
+
+ $oHeadPublisher->assign('permitodelete', $RBAC->userCanAccess('PM_FOLDER_DELETE'));
+ $oHeadPublisher->assign('permitoaddfile', $RBAC->userCanAccess('PM_FOLDERS_ADD_FILE'));
+ $oHeadPublisher->assign('permitoaddfolder', $RBAC->userCanAccess('PM_FOLDERS_ADD_FOLDER'));
+
+ $scripts = ['/js/ext/translation.'.SYS_LANG.'.js'];
+ foreach ($scripts as $file) {
+ $header = $header . "\n";
+ }
+ // die($oHeadPublisher->getExtJsVariablesScript());
+ $template = new TemplatePower(PATH_HTML. 'fileManager/index.html');
+ $template->prepare();
+ $template->assign('header', $header);
+ $template->assign('bodyTemplate', $oHeadPublisher->getExtJsVariablesScript());
+ echo $template->getOutputContent();
+ return;
+ break;
default:
$oHeadPublisher->addExtJsScript('cases/casesStartPage', false); //adding a javascript file .js
$oHeadPublisher->addContent('cases/casesStartPage'); //adding a html file .html.