gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 23:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-20 17:21:24 +01:00
commit a6673fe908
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -75,6 +75,8 @@
- add support for fine-uploader as a replacement for the old jumploader - add support for fine-uploader as a replacement for the old jumploader
- when importing from filesystem, the imported folder can be deleted afterwards - when importing from filesystem, the imported folder can be deleted afterwards
- new calendar - new calendar
- move folder/document properly checks for access right if done by drag and
drop (Closes #309)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.32 Changes in version 4.3.32

4
op/op.Ajax.php
View File

@ -251,7 +251,7 @@ switch($command) {
} else { } else {
$mfolder = $dms->getFolder($_REQUEST['folderid']); $mfolder = $dms->getFolder($_REQUEST['folderid']);
if($mfolder) { if($mfolder) {
if ($mfolder->getAccessMode($user) >= M_READ) { if ($mfolder->getAccessMode($user) >= M_READWRITE) {
if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) { if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
if($folder->getAccessMode($user) >= M_READWRITE) { if($folder->getAccessMode($user) >= M_READWRITE) {
if($mfolder->setParent($folder)) { if($mfolder->setParent($folder)) {
@ -290,7 +290,7 @@ switch($command) {
} else { } else {
$mdocument = $dms->getDocument($_REQUEST['docid']); $mdocument = $dms->getDocument($_REQUEST['docid']);
if($mdocument) { if($mdocument) {
if ($mdocument->getAccessMode($user) >= M_READ) { if ($mdocument->getAccessMode($user) >= M_READWRITE) {
if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) { if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
if($folder->getAccessMode($user) >= M_READWRITE) { if($folder->getAccessMode($user) >= M_READWRITE) {
if($mdocument->setFolder($folder)) { if($mdocument->setFolder($folder)) {

4
views/bootstrap/class.Calendar.php
View File

@ -388,9 +388,9 @@ $(document).ready(function() {
$this->htmlStartPage(getMLText("calendar")); $this->htmlStartPage(getMLText("calendar"));
$this->globalNavigation(); $this->globalNavigation();
$this->contentStart(); $this->contentStart();
$this->pageNavigation("", "calendar", array()); // $this->pageNavigation("", "calendar", array());
?> ?>
<div class="row-fluid"> <div class="row-fluid" style="margin-bottom: 20px;">
<div id="calendar" class="span8" _style="display: inline-block; float: left;"></div> <div id="calendar" class="span8" _style="display: inline-block; float: left;"></div>
<div id="docinfo" class="span4" _style="display: inline-block; float: right;"> <div id="docinfo" class="span4" _style="display: inline-block; float: right;">
<div class="ajax iteminfo" data-view="Calendar" data-action="iteminfo" ></div> <div class="ajax iteminfo" data-view="Calendar" data-action="iteminfo" ></div>