From c3fabbe9548a695c9d6dd27627529be52225e238 Mon Sep 17 00:00:00 2001 From: QuickApps Date: Wed, 12 Mar 2014 00:24:48 +0100 Subject: [PATCH] Fix: related to 2700e62713 --- QuickApps/Config/Schema/data/QaTerm.php | 6 +++--- QuickApps/View/Helper/QaJsHelper.php | 28 ++++++++++--------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/QuickApps/Config/Schema/data/QaTerm.php b/QuickApps/Config/Schema/data/QaTerm.php index e828452f..15be1c49 100644 --- a/QuickApps/Config/Schema/data/QaTerm.php +++ b/QuickApps/Config/Schema/data/QaTerm.php @@ -10,7 +10,7 @@ class QaTerm { 'description' => '', 'modified' => '1319979841', 'created' => '1319979841', - 'parent_id' => '', + 'parent_id' => '0', 'lft' => '1', 'rght' => '6' ), @@ -22,7 +22,7 @@ class QaTerm { 'description' => '', 'modified' => '1319979888', 'created' => '1319979888', - 'parent_id' => '', + 'parent_id' => '0', 'lft' => '7', 'rght' => '8' ), @@ -34,7 +34,7 @@ class QaTerm { 'description' => '', 'modified' => '1319979899', 'created' => '1319979899', - 'parent_id' => '', + 'parent_id' => '0', 'lft' => '9', 'rght' => '10' ), diff --git a/QuickApps/View/Helper/QaJsHelper.php b/QuickApps/View/Helper/QaJsHelper.php index 5875e40c..62eeafba 100644 --- a/QuickApps/View/Helper/QaJsHelper.php +++ b/QuickApps/View/Helper/QaJsHelper.php @@ -1,4 +1,6 @@ * @link http://www.quickappscms.org */ -class QaJsHelper extends AppHelper { -/** - * Other helpers used by QaFormHelper - * - * @var array - * @access public - */ - public $helpers = array('CoreJs' => array('className' => 'Js')); - +class QaJsHelper extends JsHelper { /** * call__ Allows for dispatching of methods to the Engine Helper. * methods in the Engines bufferedMethods list will be automatically buffered. @@ -38,7 +32,7 @@ class QaJsHelper extends AppHelper { * @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper */ public function __call($method, $params) { - return $this->CoreJs->__call($method, $params); + return parent::__call($method, $params); } /** @@ -56,7 +50,7 @@ public function value($val = array(), $quoteString = null, $key = 'value') { $this->hook('js_value_alter', $data); extract($data); - return $this->CoreJs->value($val, $quoteString, $key); + return parent::value($val, $quoteString, $key); } /** @@ -82,7 +76,7 @@ public function value($val = array(), $quoteString = null, $key = 'value') { public function writeBuffer($options = array()) { $this->hook('js_write_buffer_alter', $options); - $this->CoreJs->writeBuffer($options); + parent::writeBuffer($options); } /** @@ -100,7 +94,7 @@ public function buffer($script, $top = false) { $this->hook('js_buffer_alter', $data); extract($data); - return $this->CoreJs->buffer($script, $top); + return parent::buffer($script, $top); } /** @@ -113,7 +107,7 @@ public function buffer($script, $top = false) { public function getBuffer($clear = true) { $this->hook('js_get_buffer_alter', $clear); - return $this->CoreJs->getBuffer($clear); + return parent::getBuffer($clear); } /** @@ -141,7 +135,7 @@ public function link($title, $url = null, $options = array()) { $this->hook('js_link_alter', $data); extract($data); - return $this->CoreJs->link($title, $url, $options); + return parent::link($title, $url, $options); } /** @@ -160,7 +154,7 @@ public function set($one, $two = null) { $this->hook('js_set_alter', $data); extract($data); - return $this->CoreJs->set($one, $two); + return parent::set($one, $two); } /** @@ -190,6 +184,6 @@ public function submit($caption = null, $options = array()) { $this->hook('js_submit_alter', $data); extract($data); - return $this->CoreJs->set($caption, $options); + return parent::set($caption, $options); } } \ No newline at end of file