From b7a1e438f7597fe28cd07050bfa17f9614074668 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 09:41:45 +0000 Subject: [PATCH] BUGFIX: Fix changing the URLSegment on a page making the Draft Site link git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102475 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 2 ++ javascript/LeftAndMain.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 74504c0d..93b1e4a8 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -304,6 +304,8 @@ JS; if($record) { $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($stageURLField = new HiddenField("StageURLSegment")); $fields->push(new HiddenField("TreeTitle", false, $record->TreeTitle)); diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js index a6838d8e..6927e51a 100644 --- a/javascript/LeftAndMain.js +++ b/javascript/LeftAndMain.js @@ -373,7 +373,9 @@ var ss_MainLayout; */ refresh: function() { // 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) { var locale = this.getForm().find(':input[name=Locale]').val(); var url = urlSegment;