Changeset 57058

Timestamp:

29/06/08 14:26:54 (2 months ago)

Author:

ischommer

Message:

BUGFIX Fixed HTMLEditorField and TreeSelectorField? to work with new URL handling (callfieldmethod-syntax is deprecated)
API CHANGE Replacing forward slashes in Form->FormName?() to comply with new URL handling syntax

Location:

modules/sapphire/branches/roa

Files:

• forms/Form.php (modified) (1 diff)
• forms/HtmlEditorField.php (modified) (4 diffs)
• javascript/FieldEditor.js (modified) (1 diff)
• javascript/TreeSelectorField.js (modified) (3 diffs)

modules/sapphire/branches/roa/forms/Form.php

@@ -458 +458 @@
         function FormName() {
                 if($this->htmlID) return $this->htmlID;
-                else return $this->class . '_' . str_replace('.','',$this->name);
+                else return $this->class . '_' . str_replace(array('.','/'),'',$this->name);
         }
 

modules/sapphire/branches/roa/forms/HtmlEditorField.php

@@ -263 +263 @@
  * @subpackage fields-formattedinput
  */
-class HtmlEditorField_Toolbar extends ViewableData {
+class HtmlEditorField_Toolbar extends RequestHandlingData {
         protected $controller, $name;
         
@@ -354 +354 @@
                 $form = new Form(
                         $this->controller,
-                        "{$this->name}.LinkForm", 
+                        "{$this->name}/LinkForm", 
                         new FieldSet(
                                 new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="'._t('HtmlEditorField.CLOSE', 'close').'" title="'._t('HtmlEditorField.CLOSE', 'close').'" />'._t('HtmlEditorField.LINK', 'Link').'</h2>'),
@@ -386 +386 @@
                 $form = new Form(
                         $this->controller,
-                        "{$this->name}.ImageForm", 
+                        "{$this->name}/ImageForm", 
                         new FieldSet(
                                 new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="'._t('HtmlEditorField.CLOSE', 'close').'" title="'._t('HtmlEditorField.CLOSE', 'close').'" />'._t('HtmlEditorField.IMAGE', 'Image').'</h2>'),
@@ -426 +426 @@
                 $form = new Form(
                         $this->controller,
-                        "{$this->name}.FlashForm", 
+                        "{$this->name}/FlashForm", 
                         new FieldSet(
                                 new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="'._t('HtmlEditorField.CLOSE', 'close').'" title="'._t('HtmlEditorField.CLOSE', 'close').'" />'._t('HtmlEditorField.FLASH', 'Flash').'</h2>'),

modules/sapphire/branches/roa/javascript/FieldEditor.js

@@ -496 +496 @@
 
                         urlForFieldMethod: function(methodName) {
-                                return this.ownerForm().action + '&action_callfieldmethod=1&fieldName=' + 'Fields' + '&ajax=1&methodName=' + methodName + '&NewID=' + this.numNewFields; 
+                                return this.ownerForm().action + '/field/Fields/' + methodName + '?NewID=' + this.numNewFields; 
                         },
                         ownerForm: function() {

modules/sapphire/branches/roa/javascript/TreeSelectorField.js

@@ -37 +37 @@
         
         helperURLBase: function() {
-                return this.ownerForm().action + '&action_callfieldmethod=1&fieldName=' + this.inputTag.name + '&ajax=1' + ($('SecurityID') ? '&SecurityID=' + $('SecurityID').value : '');
+                return this.ownerForm().action + '/field/' + this.inputTag.name + '/';
         },
         ownerForm: function() {
@@ -130 +130 @@
         
         ajaxGetTree: function(after) {
-                var ajaxURL = this.helperURLBase() + '&methodName=gettree&forceValues=' + this.inputTag.value;
+                var ajaxURL = this.helperURLBase() + 'gettree?forceValues=' + this.inputTag.value;
+                ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : '';
                 new Ajax.Request(ajaxURL, {
                         method : 'get', 
@@ -175 +176 @@
                 ul.innerHTML = 'loading...';
                 
-                new Ajax.Request(this.options.dropdownField.helperURLBase() + '&methodName=getsubtree&SubtreeRootID=' + this.getIdx(), {
+                var ajaxURL = this.options.dropdownField.helperURLBase() + 'getsubtree?&SubtreeRootID=' + this.getIdx();
+                ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : '';
+                
+                new Ajax.Request(ajaxURL, {
                         onSuccess : this.installSubtree.bind(this),
                         onFailure : function(response) { errorMessage('error loading subtree', response); }