gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-09-09 11:29:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.14' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-01-29 18:32:16 +01:00
commit 061ed035cc
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/package.xml
View File

@ -12,8 +12,8 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2014-11-27</date> <date>2015-01-29</date>
<time>11:56:35</time> <time>18:23:24</time>
<version> <version>
<release>4.3.14</release> <release>4.3.14</release>
<api>4.3.14</api> <api>4.3.14</api>

2
out/out.UpdateDocument.php
View File

@ -61,7 +61,7 @@ $folder = $document->getFolder();
$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, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode)); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
if($view) { if($view) {
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view->show(); $view->show();

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

@ -161,7 +161,7 @@ $(document).ready(function() {
<tr> <tr>
<td><?php printMLText("expires");?>:</td> <td><?php printMLText("expires");?>:</td>
<td> <td>
<span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>"> <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>"> <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i></span>
</span>&nbsp; </span>&nbsp;

13
views/bootstrap/class.UpdateDocument.php
View File

@ -43,6 +43,7 @@ class SeedDMS_View_UpdateDocument extends SeedDMS_Bootstrap_Style {
$enableselfrevapp = $this->params['enableselfrevapp']; $enableselfrevapp = $this->params['enableselfrevapp'];
$dropfolderdir = $this->params['dropfolderdir']; $dropfolderdir = $this->params['dropfolderdir'];
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$presetexpiration = $this->params['presetexpiration'];
$documentid = $document->getId(); $documentid = $document->getId();
$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
@ -150,11 +151,19 @@ function checkForm()
<textarea name="comment" rows="4" cols="80"></textarea> <textarea name="comment" rows="4" cols="80"></textarea>
</td> </td>
</tr> </tr>
<?php
if($presetexpiration) {
if(!($expts = strtotime($presetexpiration)))
$expts = time();
} else {
$expts = time();
}
?>
<tr> <tr>
<td><?php printMLText("expires");?>:</td> <td><?php printMLText("expires");?>:</td>
<td class="standardText"> <td class="standardText">
<span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>"> <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y'); ?>"> <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i></span>
</span><br /> </span><br />
<label class="checkbox inline"> <label class="checkbox inline">