[Fmsystem-commits] [9429] frontend: fixes

[Sigurd Nes]

Revision: 9429
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9429
Author:   sigurdne
Date:     2012-05-23 11:41:19 +0000 (Wed, 23 May 2012)
Log Message:
-----------
frontend: fixes

Modified Paths:
--------------
    trunk/frontend/inc/class.uientity.inc.php
    trunk/frontend/js/yahoo/entity.list.js

Modified: trunk/frontend/inc/class.uientity.inc.php
===================================================================
--- trunk/frontend/inc/class.uientity.inc.php   2012-05-23 09:47:38 UTC (rev 
9428)
+++ trunk/frontend/inc/class.uientity.inc.php   2012-05-23 11:41:19 UTC (rev 
9429)
@@ -164,7 +164,6 @@
                        }
 
                        $datatable = array();
-                       $values_combo_box = array();
 
                        if($this->cat_id)
                        {
@@ -199,10 +198,6 @@
                                // this array "$arr_filter_hide" indicate what 
filters are hidden or not
                                $arr_filter_hide = array();
 
-                               $values_combo_box[0]  = 
$this->bo->get_criteria_list($this->criteria_id);
-                               $default_value = array 
('id'=>'','name'=>lang('no criteria'));
-                               array_unshift 
($values_combo_box[0],$default_value);
-
                                $datatable['actions']['form'] = array
                                        (
                                                array
@@ -318,14 +313,35 @@
 
                                $custom = 
createObject('phpgwapi.custom_fields');
                                $attrib_data = 
$custom->find($this->type_app[$this->type],".{$this->type}.{$this->entity_id}.{$this->cat_id}",
 0, '','','',true, true);
+
+                               $button_def = array();
+                               $code_inner = array();
+
+                               $values_combo_box = array();
 /*
+                               $values_combo_box[0]  = 
$this->bo->get_criteria_list($this->criteria_id);
+                               $default_value = array 
('id'=>'','name'=>lang('no criteria'));
+                               array_unshift 
($values_combo_box[0],$default_value);
+
+                               
$datatable['actions']['form'][0]['fields']['field'][] = array
+                               (
+                                       'id' => 'btn_criteria_id',
+                                       'name' => 'criteria_id',
+                                       'value' => lang('search criteria'),
+                                       'type' => 'button',
+                                       'style' => 'filter',
+                                       'tab_index' => 0
+                               );
+
+                               
$datatable['actions']['form'][0]['fields']['hidden_value'][] = array
+                               (
+                                       'id'    => "values_combo_box_0",
+                                       'value' => 
$this->bocommon->select2String($values_combo_box[0])                            
             
+                               );
+
                                $button_def[] = "oMenuButton_0";
                                $code_inner[] = "{order:0, 
var_URL:'criteria_id',name:'btn_criteria_id',style:'genericbutton',dependiente:[]}";
 */
-
-                               $button_def = array();
-                               $code_inner = array();
-
                                if($attrib_data)
                                {
                                        $i = 0;
@@ -381,6 +397,7 @@
                                {
                                        $code .= 'var selectsButtons = [];';
                                }
+
                                $GLOBALS['phpgw']->js->add_code('', $code);
 
                                //      eliminates those empty filters

Modified: trunk/frontend/js/yahoo/entity.list.js
===================================================================
--- trunk/frontend/js/yahoo/entity.list.js      2012-05-23 09:47:38 UTC (rev 
9428)
+++ trunk/frontend/js/yahoo/entity.list.js      2012-05-23 11:41:19 UTC (rev 
9429)
@@ -1,17 +1,7 @@
 //--------------------------------------------------------
 // Declaration of location.index vars
 //--------------------------------------------------------
-       //define SelectButton
-/*
-       var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3, 
oMenuButton_4;
-       var selectsButtons = [
-       {order:0, var_URL:'cat_id',             name:'btn_cat_id',              
style:'categorybutton', dependiente:''},
-       {order:1, var_URL:'district_id',name:'btn_district_id', 
style:'districtbutton', dependiente:''},
-       {order:2, var_URL:'status',             name:'btn_status_id',   
style:'statusbutton',   dependiente:''},
-       {order:3, var_URL:'filter',             name:'btn_user_id',             
style:'userIdbutton',   dependiente:''},
-       {order:4, var_URL:'criteria_id', 
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
-       ]
-*/
+       //SelectButton deined i ui-class
        // define buttons
        var oNormalButton_0, oNormalButton_1, oNormalButton_2;
        var normalButtons = [