gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.17' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-04-14 06:21:12 +02:00
commit db8e3bbfbb
8 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
out/out.AddDocument.php
View File

@ -48,7 +48,7 @@ if($settings->_quota > 0) {
} }
$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, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
if($view) { if($view) {
$view->show(); $view->show();
exit; exit;

2
out/out.AddSubFolder.php
View File

@ -41,7 +41,7 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
} }
$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, 'strictformcheck'=>$settings->_strictFormCheck)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault));
if($view) { if($view) {
$view->show(); $view->show();
exit; exit;

2
out/out.EditDocument.php
View File

@ -54,7 +54,7 @@ $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinit
$accessop = new SeedDMS_AccessOperation($document, $user, $settings); $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, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault));
if($view) { if($view) {
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view->show(); $view->show();

2
out/out.EditFolder.php
View File

@ -42,7 +42,7 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all)); $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
$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, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'rootfolderid'=>$settings->_rootFolderID)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'rootfolderid'=>$settings->_rootFolderID, 'orderby'=>$settings->_sortFoldersDefault));
if($view) { if($view) {
$view->show(); $view->show();
exit; exit;

3
views/bootstrap/class.AddDocument.php
View File

@ -44,6 +44,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$presetexpiration = $this->params['presetexpiration']; $presetexpiration = $this->params['presetexpiration'];
$sortusersinlist = $this->params['sortusersinlist']; $sortusersinlist = $this->params['sortusersinlist'];
$orderby = $this->params['orderby'];
$folderid = $folder->getId(); $folderid = $folder->getId();
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
@ -142,7 +143,7 @@ $(document).ready(function() {
</tr> </tr>
<tr> <tr>
<td><?php printMLText("sequence");?>:</td> <td><?php printMLText("sequence");?>:</td>
<td><?php $this->printSequenceChooser($folder->getDocuments('s'));?></td> <td><?php $this->printSequenceChooser($folder->getDocuments('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off'); ?></td>
</tr> </tr>
<?php <?php
$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all)); $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all));

3
views/bootstrap/class.AddSubFolder.php
View File

@ -36,6 +36,7 @@ class SeedDMS_View_AddSubFolder extends SeedDMS_Bootstrap_Style {
$user = $this->params['user']; $user = $this->params['user'];
$folder = $this->params['folder']; $folder = $this->params['folder'];
$strictformcheck = $this->params['strictformcheck']; $strictformcheck = $this->params['strictformcheck'];
$orderby = $this->params['orderby'];
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
$this->globalNavigation($folder); $this->globalNavigation($folder);
@ -87,7 +88,7 @@ function checkForm()
</tr> </tr>
<tr> <tr>
<td class="inputDescription"><?php printMLText("sequence");?>:</td> <td class="inputDescription"><?php printMLText("sequence");?>:</td>
<td><?php $this->printSequenceChooser($folder->getSubFolders('s'));?></td> <td><?php $this->printSequenceChooser($folder->getSubFolders('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');?></td>
</tr> </tr>
<?php <?php
$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all)); $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));

2
views/bootstrap/class.EditDocument.php
View File

@ -38,6 +38,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
$document = $this->params['document']; $document = $this->params['document'];
$attrdefs = $this->params['attrdefs']; $attrdefs = $this->params['attrdefs'];
$strictformcheck = $this->params['strictformcheck']; $strictformcheck = $this->params['strictformcheck'];
$orderby = $this->params['orderby'];
$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
$this->globalNavigation($folder); $this->globalNavigation($folder);
@ -137,6 +138,7 @@ function checkForm()
print "<td class=\"inputDescription\">" . getMLText("sequence") . ":</td>"; print "<td class=\"inputDescription\">" . getMLText("sequence") . ":</td>";
print "<td>"; print "<td>";
$this->printSequenceChooser($folder->getDocuments('s'), $document->getID()); $this->printSequenceChooser($folder->getDocuments('s'), $document->getID());
if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');
print "</td></tr>"; print "</td></tr>";
} }
if($attrdefs) { if($attrdefs) {

2
views/bootstrap/class.EditFolder.php
View File

@ -38,6 +38,7 @@ class SeedDMS_View_EditFolder extends SeedDMS_Bootstrap_Style {
$attrdefs = $this->params['attrdefs']; $attrdefs = $this->params['attrdefs'];
$rootfolderid = $this->params['rootfolderid']; $rootfolderid = $this->params['rootfolderid'];
$strictformcheck = $this->params['strictformcheck']; $strictformcheck = $this->params['strictformcheck'];
$orderby = $this->params['orderby'];
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
$this->globalNavigation($folder); $this->globalNavigation($folder);
@ -91,6 +92,7 @@ function checkForm() {
print "<td>" . getMLText("sequence") . ":</td>"; print "<td>" . getMLText("sequence") . ":</td>";
print "<td>"; print "<td>";
$this->printSequenceChooser($parent->getSubFolders('s'), $folder->getID()); $this->printSequenceChooser($parent->getSubFolders('s'), $folder->getID());
if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');
print "</td></tr>\n"; print "</td></tr>\n";
} }