From 1601a07bba6f6a04d6d4a4611c5b4735bc19fa56 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Thu, 2 Aug 2012 23:37:20 +0000 Subject: [PATCH] admin news comments were displaying in reverse. added 'reverse=1' read/write parm to admin-ui. --- e107_admin/newspost.php | 2 +- e107_handlers/admin_ui.php | 13 +++++++++++-- e107_handlers/form_handler.php | 12 ++++++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 7d3be5ed5..977a3507c 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -315,7 +315,7 @@ class news_admin_ui extends e_admin_ui 'news_class' => array('title' => NWSLAN_22, 'type' => 'userclasses', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_render_type' => array('title' => LAN_NEWS_49, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_sticky' => array('title' => LAN_NEWS_28, 'type' => 'boolean', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'batch'=>true, 'filter'=>true), - 'news_allow_comments' => array('title' => NWSLAN_15, 'type' => 'boolean', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false), + 'news_allow_comments' => array('title' => NWSLAN_15, 'type' => 'boolean', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1','writeParms'=>'reverse=1'), 'news_comment_total' => array('title' => LAN_NEWS_60, 'type' => 'number', 'width' => '10%', 'thclass' => '', 'class' => null, 'nosort' => false), 'options' => array('title' => LAN_OPTIONS, 'type' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center', 'nosort' => true, 'forced' => TRUE) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index b76d419c4..5714c7901 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -4614,8 +4614,17 @@ class e_admin_form_ui extends e_form { case 'bool': case 'boolean': //TODO modify description based on $val['parm] - $option['bool__'.$key.'__1'] = LAN_YES; - $option['bool__'.$key.'__0'] = LAN_NO; + if(vartrue($parms['reverse'])) // reverse true/false values; + { + $option['bool__'.$key.'__0'] = LAN_YES; // see newspost.php : news_allow_comments for an example. + $option['bool__'.$key.'__1'] = LAN_NO; + } + else + { + $option['bool__'.$key.'__1'] = LAN_YES; + $option['bool__'.$key.'__0'] = LAN_NO; + } + if($type == 'batch') { $option['boolreverse__'.$key] = LAN_BOOL_REVERSE; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 1d64bf5bc..a431392be 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1921,7 +1921,15 @@ class e_form case 'bool': case 'boolean': $false = vartrue($parms['trueonly']) ? "" : ADMIN_FALSE_ICON; - $value = $value ? ADMIN_TRUE_ICON : $false; + + if(vartrue($parms['reverse'])) + { + $value = ($value) ? $false : ADMIN_TRUE_ICON; + } + else + { + $value = $value ? ADMIN_TRUE_ICON : $false; + } break; case 'url': @@ -2223,7 +2231,7 @@ class e_form $lenabled = vartrue($parms['enabled'], 'LAN_ENABLED'); $ldisabled = vartrue($parms['disabled'], 'LAN_DISABLED'); unset($parms['enabled'], $parms['disabled']); - $ret = $this->radio_switch($key, $value, defset($lenabled, $lenabled), defset($ldisabled, $ldisabled)); + $ret = $this->radio_switch($key, $value, defset($lenabled, $lenabled), defset($ldisabled, $ldisabled),$parms); break; case 'method': // Custom Function