mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-02 22:28:38 +02:00
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
This commit is contained in:
parent
480d5068d1
commit
b7a1e438f7
@ -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));
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user