tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-07-03 09:59:26 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fix changing the URLSegment on a page making the Draft Site link

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102475 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-12 09:41:45 +00:00
parent 480d5068d1
commit b7a1e438f7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CMSMain.php
View File

@ -304,6 +304,8 @@ JS;
if($record) { if($record) {
$fields->push($idField = new HiddenField("ID", false, $id)); $fields->push($idField = new HiddenField("ID", false, $id));
// Necessary for different subsites
$fields->push($liveURLField = new HiddenField("AbsoluteLink", false, $record->AbsoluteLink()));
$fields->push($liveURLField = new HiddenField("LiveURLSegment")); $fields->push($liveURLField = new HiddenField("LiveURLSegment"));
$fields->push($stageURLField = new HiddenField("StageURLSegment")); $fields->push($stageURLField = new HiddenField("StageURLSegment"));
$fields->push(new HiddenField("TreeTitle", false, $record->TreeTitle)); $fields->push(new HiddenField("TreeTitle", false, $record->TreeTitle));

4
javascript/LeftAndMain.js
View File

@ -373,7 +373,9 @@ var ss_MainLayout;
*/ */
refresh: function() { refresh: function() {
// TODO Compatible with nested urls? // TODO Compatible with nested urls?
var urlSegment = this.getForm().find(':input[name=URLSegment]').val(); var urlSegment = this.getForm().find(':input[name=AbsoluteLink]').val();
if(!urlSegment) urlSegment = this.getForm().find(':input[name=URLSegment]').val();
if(urlSegment) { if(urlSegment) {
var locale = this.getForm().find(':input[name=Locale]').val(); var locale = this.getForm().find(':input[name=Locale]').val();
var url = urlSegment; var url = urlSegment;