[Fmsystem-commits] [8673]

[Torstein]

Revision: 8673
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8673
Author:   vator
Date:     2012-01-24 14:01:45 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/inc/class.uicontrol_location.inc.php

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-01-24 13:59:43 UTC 
(rev 8672)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-01-24 14:01:45 UTC 
(rev 8673)
@@ -391,70 +391,5 @@
                }
                */
                
-               /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker 
denne... Kanskje den bør slettes...
-                * 
-               public function query()
-               {
-                       $params = array(
-                               'start' => phpgw::get_var('startIndex', 'int', 
'REQUEST', 0),
-                               'results' => phpgw::get_var('results', 'int', 
'REQUEST', null),
-                               'query' => phpgw::get_var('query'),
-                               'sort'  => phpgw::get_var('sort'),
-                               'dir'   => phpgw::get_var('dir'),
-                               'filters' => $filters
-                       );
-                       
-                       $search_for = phpgw::get_var('query');
-
-                       
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
-                       {
-                               $user_rows_per_page = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
-                       }
-                       else {
-                               $user_rows_per_page = 10;
-                       }
-                       
-                       // YUI variables for paging and sorting
-                       $start_index    = phpgw::get_var('startIndex', 'int');
-                       $num_of_objects = phpgw::get_var('results', 'int', 
'GET', $user_rows_per_page);
-                       $sort_field             = phpgw::get_var('sort');
-                       if($sort_field == null)
-                       {
-                               $sort_field = 'control_id';
-                       }
-                       $sort_ascending = phpgw::get_var('dir') == 'desc' ? 
false : true;
-                       //Create an empty result set
-                       $records = array();
-                       
-                       //Retrieve a contract identifier and load corresponding 
contract
-/*                     $control_id = phpgw::get_var('control_id');
-                       if(isset($control_id))
-                       {
-                               $control = $this->so->get_single($control_id);
-                       }
-*/
-               /*
-                       $result_objects = $this->so->get($start_index, 
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type, 
$filters);
-                       $object_count = $this->so->get_count($search_for, 
$search_type, $filters);
-                       //var_dump($result_objects);
-                                                               
-                       $results = array();
-                       
-                       foreach($result_objects as $check_list_obj)
-                       {
-                               $results['results'][] = 
$check_list_obj->serialize();   
-                       }
-                       
-                       $results['total_records'] = $object_count;
-                       $results['start'] = $params['start'];
-                       $results['sort'] = $params['sort'];
-                       $results['dir'] = $params['dir'];
-
-                       array_walk($results["results"], array($this, 
"_add_links"), "controller.uicheck_list.view_check_lists_for_control");
-
-                       return $this->yui_results($results);
-               }
-               */
-               
                public function query(){}
        }
\ No newline at end of file

Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php       2012-01-24 
13:59:43 UTC (rev 8672)
+++ trunk/controller/inc/class.uicontrol_location.inc.php       2012-01-24 
14:01:45 UTC (rev 8673)
@@ -60,12 +60,6 @@
                                                                                
'index' => true,
                                                                                
'view_locations_for_control'    => true,
                                                                                
'add_location_to_control'               => true,
-                                                                               
'add_check_list'                                => true,
-                                                                               
'save_check_list'                               => true,
-                                                                               
'edit_check_list'                               => true,
-                                                                               
'create_case_message'                   => true,
-                                                                               
'view_control_info'                     => true,
-                                                                               
'view_cases_for_check_list'             => true
                                                                        );
 
                function __construct()