From ab9d62b53c92cadac613071235e020731416a35a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 19 Sep 2011 21:34:46 +0200 Subject: [PATCH] MINOR Removed hardcoding of history ajax links --- code/controllers/CMSPageHistoryController.php | 6 ++++++ javascript/CMSPageHistoryController.js | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/controllers/CMSPageHistoryController.php b/code/controllers/CMSPageHistoryController.php index 6f5b9b7a..5be1f8fe 100644 --- a/code/controllers/CMSPageHistoryController.php +++ b/code/controllers/CMSPageHistoryController.php @@ -221,6 +221,12 @@ class CMSPageHistoryController extends CMSMain { $hiddenID->setValue($id); $form->unsetValidator(); + $form->addExtraClass('cms-versions-form'); // placeholder, necessary for $.metadata() to work + $form->addExtraClass(Convert::raw2json(array( + 'link-tmpl-compare' => Controller::join_links($this->Link('compare'), '%s', '%s', '%s'), + 'link-tmpl-show' => Controller::join_links($this->Link('show'), '%s', '%s'), + ))); + return $form; } diff --git a/javascript/CMSPageHistoryController.js b/javascript/CMSPageHistoryController.js index e75e425c..9b3f7801 100644 --- a/javascript/CMSPageHistoryController.js +++ b/javascript/CMSPageHistoryController.js @@ -54,23 +54,23 @@ if(!id) return false; - var button, url, selected, to, from, compare, data; + var button, url, selected, to, from, compare, data, metadata; + metadata = this.metadata({type: 'class'}); compare = (this.find(":input[name=CompareMode]").is(":checked")); selected = this.find("table input[type=checkbox]").filter(":checked"); - if(compare) { if(selected.length != 2) return false; to = selected.eq(0).val(); from = selected.eq(1).val(); button = this.find(':submit[name=action_doCompare]'); - url = 'admin/page/history/compare/'+ [id,from,to].join('/') +"/"; + url = ss.i18n.sprintf(metadata['link-tmpl-compare'], id,from,to); } else { to = selected.eq(0).val(); button = this.find(':submit[name=action_doShowVersion]'); - url = 'admin/page/history/show/'+ [id,to].join('/') + "/"; + url = ss.i18n.sprintf(metadata['link-tmpl-show'], id,to); } window.History.pushState({selector: '.cms-edit-form'}, '', url);