tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'cms-preview-history'

This commit is contained in:
Ingo Schommer 2011-07-08 15:37:40 +02:00
parent 1ad4bd6dfd ebb1e0f370
commit c6a75449a4
18 changed files with 104 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controller/AssetAdmin.php
View File

@ -358,7 +358,7 @@ JS
return $record->ID;
} else if($this->isAjax()) {
$form = $this->getEditForm($record->ID);
return $form->formHtmlContent();
return $form->forTemplate();
} else {
return $this->redirect(Controller::join_links($this->Link('show'), $record->ID));
}

45
code/controller/CMSMain.php
View File

@ -345,7 +345,7 @@ JS;
$this->response->addHeader('X-Status', _t('LeftAndMain.SAVEDUP'));
return $form->formHtmlContent();
return $form->forTemplate();
}
/**
* Get a database record to be managed by the CMS
@ -438,14 +438,6 @@ JS;
$actions = $record->getCMSActions();
}
// Add a default or custom validator.
// @todo Currently the default Validator.js implementation
// adds javascript to the document body, meaning it won't
// be included properly if the associated fields are loaded
// through ajax. This means only serverside validation
// will kick in for pages+validation loaded through ajax.
// This will be solved by using less obtrusive javascript validation
// in the future, see http://open.silverstripe.com/ticket/2915 and http://open.silverstripe.com/ticket/3386
if($record->hasMethod('getCMSValidator')) {
$validator = $record->getCMSValidator();
} else {
@ -464,7 +456,7 @@ JS;
$form->addExtraClass('cms-edit-form');
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
// TODO Can't merge $FormAttributes in template at the moment
$form->addExtraClass('cms-content center ss-tabset');
$form->addExtraClass('cms-content center ss-tabset ' . $this->BaseCSSClasses());
if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
if(!$record->canEdit() || $record->IsDeletedFromStage) {
@ -505,6 +497,19 @@ JS;
return $form;
}
public function currentPageID() {
$id = parent::currentPageID();
// Fall back to homepage record
if(!$id) {
$homepageSegment = RootURLController::get_homepage_link();
$homepageRecord = DataObject::get_one('SiteTree', sprintf('"URLSegment" = \'%s\'', $homepageSegment));
if($homepageRecord) $id = $homepageRecord->ID;
}
return $id;
}
//------------------------------------------------------------------------------------------//
// Data saving handlers
@ -578,7 +583,7 @@ JS;
$form = $this->getEditForm($record->ID);
}
return $form->formHtmlContent();
return $form->forTemplate();
}
@ -615,7 +620,7 @@ JS;
return $record->ID;
} else if(Director::is_ajax()) {
$form = $this->getEditForm($record->ID);
return $form->formHtmlContent();
return $form->forTemplate();
} else {
return $this->redirect(Controller::join_links($this->Link('show'), $record->ID));
}
@ -757,7 +762,7 @@ JS;
$form = $this->getEditForm($record->ID);
return $form->formHtmlContent();
return $form->forTemplate();
}
/**
@ -791,7 +796,7 @@ JS;
'Live',
"\"SiteTree_Live\".\"ID\" = $recordID"
);
return ($liveRecord) ? $form->formHtmlContent() : "";
return ($liveRecord) ? $form->forTemplate() : "";
} else {
$this->redirectBack();
}
@ -988,7 +993,7 @@ JS;
$form = $this->getEditForm($record->ID);
return $form->formHtmlContent();
return $form->forTemplate();
}
function publish($data, $form) {
@ -1013,7 +1018,7 @@ JS;
// Reload form, data and actions might have changed
$form = $this->getEditForm($record->ID);
return $form->formHtmlContent();
return $form->forTemplate();
}
function performRollback($id, $version) {
@ -1187,7 +1192,7 @@ JS;
}
if($this->isAjax()) {
return $form->formHtmlContent();
return $form->forTemplate();
} else {
$templateData = $this->customise(array(
"EditForm" => $form
@ -1426,7 +1431,7 @@ JS;
// Reload form, data and actions might have changed
$form = $this->getEditForm($restoredPage->ID);
return $form->formHtmlContent();
return $form->forTemplate();
}
function duplicate($request) {
@ -1450,7 +1455,7 @@ JS;
// Reload form, data and actions might have changed
$form = $this->getEditForm($newPage->ID);
return $form->formHtmlContent();
return $form->forTemplate();
} else {
user_error("CMSMain::duplicate() Bad ID: '$id'", E_USER_WARNING);
}
@ -1471,7 +1476,7 @@ JS;
// Reload form, data and actions might have changed
$form = $this->getEditForm($newPage->ID);
return $form->formHtmlContent();
return $form->forTemplate();
} else {
user_error("CMSMain::duplicate() Bad ID: '$id'", E_USER_WARNING);
}

17
code/controller/CMSPagesController.php
View File

@ -13,8 +13,21 @@ class CMSPagesController extends CMSMain {
}
function show($request) {
$c = new CMSPageEditController();
return $this->redirect(Controller::join_links($c->Link('show'), $request->param('ID')));
if($request->param('ID')) {
$c = new CMSPageEditController();
return $this->redirect(Controller::join_links($c->Link('show'), $request->param('ID')));
} else {
return parent::show($request);
}
}
function Link($action = null) {
// Special case: All show links should redirect to the page edit interface instead (mostly from tree nodes)
if(preg_match('/^show/', $action)) {
return singleton('CMSPageEditController')->Link($action);
} else {
return parent::Link($action);
}
}
}

13
code/controller/CMSSettingsController.php Normal file
View File

@ -0,0 +1,13 @@
<?php
class CMSSettingsController extends CMSMain {
static $url_segment = 'settings';
static $url_rule = '/$Action/$ID/$OtherID';
static $menu_priority = -1;
static $menu_title = 'Settings';
function getEditForm($id = null, $fields = null) {
return $this->RootForm();
}
}

6
code/controller/ContentController.php
View File

@ -120,6 +120,12 @@ class ContentController extends Controller {
return Security::permissionFailure($this, sprintf($message, Controller::join_links($link, "?stage=Live")));
}
}
// Redirect to admin UI if user is logged in
if($this->URLSegment != 'Security' && Permission::check('CMS_ACCESS_CMSMain') && !$this->request->getVar('cms-preview-disabled')) {
$cmsController = singleton('CMSPageEditController');
return Director::redirect(Controller::join_links($cmsController->Link('show'), $this->dataRecord->ID, '?cms-preview-expanded=1'));
}
// Use theme from the site config
if(($config = SiteConfig::current_site_config()) && $config->Theme) {

9
code/model/SiteTree.php
View File

@ -1987,7 +1987,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// "unpublish"
$unpublish = FormAction::create('unpublish', _t('SiteTree.BUTTONUNPUBLISH', 'Unpublish'), 'delete');
$unpublish->describe(_t('SiteTree.BUTTONUNPUBLISHDESC', 'Remove this page from the published site'));
$unpublish->addExtraClass('delete');
$unpublish->addExtraClass('unpublish');
$unpublish->addExtraClass('ss-ui-action-destructive');
$actions->push($unpublish);
}
@ -2025,7 +2025,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
}
// "save"
$actions->push(new FormAction('save',_t('CMSMain.SAVE','Save')));
$actions->push($saveDraftAction = new FormAction('save',_t('CMSMain.SAVE','Save Draft')));
$saveDraftAction->addExtraClass('save-draft');
}
}
@ -2411,13 +2412,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} elseif($this->IsAddedToStage) {
$tag = "ins title=\"" . _t('SiteTree.ADDEDTODRAFT', 'Added to draft site') . "\"";
} elseif($this->IsModifiedOnStage) {
$tag = "span title=\"" . _t('SiteTree.MODIFIEDONDRAFT', 'Modified on draft site') . "\" class=\"modified\"";
$tag = "span title=\"" . _t('SiteTree.MODIFIEDONDRAFT', 'Modified on draft site') . "\" class=\"status modified\"";
} else {
$tag = '';
}
$text = Convert::raw2xml(str_replace(array("\n","\r"),"",$this->MenuTitle));
return ($tag) ? "<$tag>" . $text . "</" . strtok($tag,' ') . ">" : $text;
return ($tag) ? "<span class=\"jstree-pageicon\"></span>"."<$tag>" . $text . "</" . strtok($tag,' ') . ">" : "<span class=\"jstree-pageicon\"></span>". $text;
}
/**

2
javascript/AssetAdmin.js
View File

@ -47,7 +47,7 @@
var currNode = $('.cms-tree')[0].firstSelected();
if(currNode) {
var url = $(currNode).find('a').attr('href');
$('.cms-edit-form').loadForm(url);
$('.cms-content').loadForm(url);
}
$('.cms-tree')[0].setCustomURL('admin/assets/getsubtree');
$('.cms-tree')[0].reload({onSuccess: function() {

9
javascript/CMSMain.js
View File

@ -201,8 +201,9 @@
if (e.button!=2) {
var $link = $(this);
$link.addClass('loading');
jQuery('.cms-edit-form').entwine('ss').loadForm(
jQuery('.cms-content').entwine('ss').loadForm(
$(this).attr('href'),
null,
function(e) {
$link.removeClass('loading');
}
@ -263,8 +264,9 @@
var link = $(this).siblings('.versionlink').find('a').attr('href');
td.addClass('loading');
jQuery('.cms-edit-form').entwine('ss').loadForm(
jQuery('.cms-content').entwine('ss').loadForm(
link,
null,
function(e) {
td.removeClass('loading');
}
@ -314,8 +316,9 @@
data.push({name:$button.attr('name'), value: $button.val()});
if(loadEditForm) {
jQuery('.cms-edit-form').entwine('ss').loadForm(
jQuery('.cms-content').entwine('ss').loadForm(
this.attr('action'),
null,
function(e) {
$button.removeClass('loading');
},

7
javascript/CMSPagesController.Tree.js
View File

@ -1,7 +0,0 @@
(function($) {
$('.cms-tree').bind('select_node.jstree', function(e, data) {
var node = data.rslt.obj, url = $(node).find('a:first').attr('href');
if(url && url != '#') document.location.href = url;
return false;
});
}(jQuery));

4
templates/Includes/AssetAdmin_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content center ss-tabset" data-layout="{type: 'border'}">
<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north">
<div>
@ -35,7 +35,7 @@
</div>
<div class="cms-content-form center">
<div class="cms-content-fields center">
<div id="cms-content-listview">
$EditForm
</div>

2
templates/Includes/CMSPageHistoryController_Content.ss
View File

@ -1,3 +1,3 @@
<div class="cms-content center">
<div class="cms-content center $BaseCSSClasses">
<i>Not implemented yet</i>
</div>

2
templates/Includes/CMSPageReportsController_Content.ss
View File

@ -1,3 +1,3 @@
<div class="cms-content center">
<div class="cms-content center $BaseCSSClasses">
<i>Not implemented yet</i>
</div>

5
templates/Includes/CMSPagesController_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content center ss-tabset" data-layout="{type: 'border'}">
<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north">
<div>
@ -28,9 +28,10 @@
$SearchForm
</div>
</div>
<div class="cms-content-form center ui-widget-content">
<div class="cms-content-fields center ui-widget-content">
<div id="cms-content-treeview">

2
templates/Includes/CMSPagesController_ContentToolbar.ss
View File

@ -12,7 +12,7 @@
</div>
</div>
<div>
<div class="cms-content-constructive-actions">
<a class="ss-ui-button ss-ui-action-constructive cms-page-add-button" href="#cms-page-add-form"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
</div>

4
templates/Includes/ReportAdmin_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content center" data-layout="{type: 'border'}">
<div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
<div class="cms-content-header north">
<h2><% _t('REPORTS','Reports') %></h2>
@ -17,7 +17,7 @@
</div>
<div class="cms-content-form center ui-widget-content">
<div class="cms-content-fields center ui-widget-content">
$EditForm
</div>

18
tests/controller/CMSMainTest.php
View File

@ -198,22 +198,22 @@ class CMSMainTest extends FunctionalTest {
// with insufficient permissions
$cmsUser->logIn();
$this->get('admin/pages');
$response = $this->submitForm(
'Form_AddForm',
null,
array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US')
$response = $this->post(
'admin/pages/AddForm',
array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1)
);
// should redirect, which is a permission error
$this->assertEquals(403, $response->getStatusCode(), 'Add TopLevel page must fail for normal user');
// with correct permissions
$rootEditUser->logIn();
$this->get('admin/pages/');
$response = $this->submitForm(
'Form_AddForm',
null,
array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US')
$response = $this->get('admin/pages/');
$response = $this->post(
'admin/pages/AddForm',
array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1)
);
$this->assertEquals(302, $response->getStatusCode(), 'Must be a redirect on success');
$location=$response->getHeader('Location');
$this->assertContains('/show/',$location, 'Must redirect to /show/ the new page');

11
tests/controller/ContentControllerPermissionsTest.php
View File

@ -16,19 +16,22 @@ class ContentControllerPermissionTest extends FunctionalTest {
$page->publish('Stage', 'Live');
$response = $this->get('/testpage');
$this->assertEquals($response->getStatusCode(), 200);
$this->assertEquals($response->getStatusCode(), 200, 'Doesnt require login for implicit live stage');
$response = $this->get('/testpage/?stage=Live');
$this->assertEquals($response->getStatusCode(), 200);
$this->assertEquals($response->getStatusCode(), 200, 'Doesnt require login for explicit live stage');
$response = $this->get('/testpage/?stage=Stage');
// should redirect to login
$this->assertEquals($response->getStatusCode(), 302);
$this->assertEquals($response->getStatusCode(), 302, 'Redirects to login page when not logged in for draft stage');
$this->assertContains('Security/login', $response->getHeader('Location'));
$this->logInWithPermission('CMS_ACCESS_CMSMain');
$response = $this->get('/testpage/?stage=Stage');
$this->assertEquals($response->getStatusCode(), 200);
$this->assertEquals($response->getStatusCode(), 302, 'Redirects to page view in CMS when logged in for draft stage');
$this->assertNotContains('Security/login', $response->getHeader('Location'));
$this->assertContains('admin/page/edit/show/' . $page->ID, $response->getHeader('Location'));
}

8
tests/model/SiteTreePermissionsTest.php
View File

@ -54,6 +54,7 @@ class SiteTreePermissionsTest extends FunctionalTest {
// should be prompted for a login
$response = $this->get($page->URLSegment . '?stage=Stage');
$this->assertEquals($response->getStatusCode(), '302');
$this->assertContains('Security/login', $response->getHeader('Location'));
$this->logInWithPermission('ADMIN');
@ -61,7 +62,9 @@ class SiteTreePermissionsTest extends FunctionalTest {
$this->assertEquals($response->getStatusCode(), '404');
$response = $this->get($page->URLSegment . '?stage=Stage');
$this->assertEquals($response->getStatusCode(), '200');
$this->assertEquals($response->getStatusCode(), '302');
$this->assertNotContains('Security/login', $response->getHeader('Location'));
$this->assertContains('admin/page/edit/show/' . $page->ID, $response->getHeader('Location'));
$response = $this->get($page->URLSegment . '?stage=');
$this->assertEquals($response->getStatusCode(), '404');
@ -330,9 +333,10 @@ class SiteTreePermissionsTest extends FunctionalTest {
$response = $this->get($childPage->RelativeLink());
$this->assertEquals(
$response->getStatusCode(),
200,
302,
'Authenticated members can view a page marked as "Viewable by these groups" if theyre in the listed groups by inherited permission'
);
$this->assertContains('admin/page/edit/show/' . $childPage->ID, $response->getHeader('Location'));
$this->session()->inst_set('loggedInAs', null);
}