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

Merge branch 'master' into integration

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-28 20:17:49 +01:00
commit 477c319cac
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/controllers/AssetAdmin.php
View File

@ -38,10 +38,12 @@ class AssetAdmin extends LeftAndMain {
* Return fake-ID "root" if no ID is found (needed to upload files into the root-folder) * Return fake-ID "root" if no ID is found (needed to upload files into the root-folder)
*/ */
public function currentPageID() { public function currentPageID() {
if(isset($_REQUEST['ID']) && is_numeric($_REQUEST['ID'])) { if($this->request->requestVar('ID')) {
return $_REQUEST['ID']; return $this->request->requestVar('ID');
} elseif (is_numeric($this->urlParams['ID'])) { } elseif (is_numeric($this->urlParams['ID'])) {
return $this->urlParams['ID']; return $this->urlParams['ID'];
} elseif(Session::get("{$this->class}.currentPage")) {
return Session::get("{$this->class}.currentPage");
} else { } else {
return "root"; return "root";
} }
@ -474,6 +476,18 @@ JS
return array_diff($allThumbnails, $usedThumbnails); return array_diff($allThumbnails, $usedThumbnails);
} }
/**
* @return ArrayList
*/
public function Breadcrumbs($unlinked = false) {
$items = parent::Breadcrumbs($unlinked);
// The root element should explicitly point to the root node
$items[0]->Link = Controller::join_links($this->Link('show'), 'root');
return $items;
}
} }
/** /**

5
javascript/AssetAdmin.js
View File

@ -31,7 +31,10 @@
$('#Form_EditForm_File .ss-gridfield-item').entwine({ $('#Form_EditForm_File .ss-gridfield-item').entwine({
onclick: function(e) { onclick: function(e) {
// Let actions do their own thing // Let actions do their own thing
if($(e.target).is('.action')) return; if($(e.target).is('.action')) {
this._super();
return;
}
var grid = this.closest('.ss-gridfield'); var grid = this.closest('.ss-gridfield');
if(this.data('class') == 'Folder') { if(this.data('class') == 'Folder') {

2
javascript/CMSMain.GridField.js
View File

@ -1,5 +1,5 @@
jQuery(function($){ jQuery(function($){
$('fieldset.ss-gridfield').entwine({ $('.ss-gridfield').entwine({
onopennewview: function(e, url) { onopennewview: function(e, url) {
$('.cms-container').entwine('ss').loadPanel(url); $('.cms-container').entwine('ss').loadPanel(url);
return false; return false;