tonyair/silverstripe-dms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-dms synced 2024-10-22 14:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0' into 2.1

Browse Source
This commit is contained in:
Robbie Averill 2017-12-07 23:59:44 +13:00
commit 35423c9aeb
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/cms/DMSDocumentAddController.php
View File

@ -190,14 +190,14 @@ class DMSDocumentAddController extends LeftAndMain
return Controller::join_links( return Controller::join_links(
$modelAdmin->Link('DMSDocumentSet'), $modelAdmin->Link('DMSDocumentSet'),
'EditForm/field/DMSDocumentSet/item', 'EditForm/field/DMSDocumentSet/item',
$this->getRequest()->getVar('dsid'), (int) $this->getRequest()->getVar('dsid'),
'edit' 'edit'
); );
} }
return $modelAdmin->Link(); return $modelAdmin->Link();
} }
return $this->getPageEditLink($this->currentPageID(), $this->getRequest()->getVar('dsid')); return $this->getPageEditLink($this->currentPageID(), (int) $this->getRequest()->getVar('dsid'));
} }
/** /**
@ -212,7 +212,7 @@ class DMSDocumentAddController extends LeftAndMain
return Controller::join_links( return Controller::join_links(
CMSPageEditController::singleton()->getEditForm($pageId)->FormAction(), CMSPageEditController::singleton()->getEditForm($pageId)->FormAction(),
'field/Document Sets/item', 'field/Document Sets/item',
$documentSetId (int) $documentSetId
); );
} }

3
code/model/DMSDocument.php
View File

@ -1322,6 +1322,9 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
. '<ul>'; . '<ul>';
foreach ($this->actionTasks as $panelKey => $title) { foreach ($this->actionTasks as $panelKey => $title) {
$panelKey = Convert::raw2xml($panelKey);
$title = Convert::raw2xml($title);
$html .= '<li class="ss-ui-button dmsdocument-action" data-panel="' . $panelKey . '">' $html .= '<li class="ss-ui-button dmsdocument-action" data-panel="' . $panelKey . '">'
. _t('DMSDocument.ACTION_' . strtoupper($panelKey), $title) . _t('DMSDocument.ACTION_' . strtoupper($panelKey), $title)
. '</li>'; . '</li>';

3
code/model/DMSDocument_Controller.php
View File

@ -82,6 +82,7 @@ class DMSDocument_Controller extends Controller
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$mime = finfo_file($finfo, $path); $mime = finfo_file($finfo, $path);
} elseif (is_executable($fileBin)) { } elseif (is_executable($fileBin)) {
$path = escapeshellarg($path);
// try to use the system tool // try to use the system tool
$mime = `$fileBin -i -b $path`; $mime = `$fileBin -i -b $path`;
$mime = explode(';', $mime); $mime = explode(';', $mime);
@ -89,7 +90,7 @@ class DMSDocument_Controller extends Controller
} else { } else {
// make do with what we have // make do with what we have
$ext = $doc->getExtension(); $ext = $doc->getExtension();
if ($ext =='pdf') { if ($ext == 'pdf') {
$mime = 'application/pdf'; $mime = 'application/pdf';
} elseif ($ext == 'html' || $ext =='htm') { } elseif ($ext == 'html' || $ext =='htm') {
$mime = 'text/html'; $mime = 'text/html';

2
code/tools/ShortCodeRelationFinder.php
View File

@ -39,10 +39,12 @@ class ShortCodeRelationFinder
} }
/** /**
* @param int $number
* @return DataList * @return DataList
*/ */
public function getList($number) public function getList($number)
{ {
$number = (int) $number;
$list = DataList::create('SiteTree'); $list = DataList::create('SiteTree');
$where = array(); $where = array();
$fields = $this->getShortCodeFields('SiteTree'); $fields = $this->getShortCodeFields('SiteTree');