[Fmsystem-commits] [16275]

[nelson . guerra]

Revision: 16275
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16275
Author:   nelson224
Date:     2017-02-07 22:57:44 -0500 (Tue, 07 Feb 2017)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php

Modified: 
branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php     
2017-02-08 03:57:27 UTC (rev 16274)
+++ branches/dev-syncromind-2/property/inc/class.uigeneric_document.inc.php     
2017-02-08 03:57:44 UTC (rev 16275)
@@ -61,6 +61,7 @@
 
                        $this->bo = CreateObject('property.bogeneric_document');
                        $this->bocommon = & $this->bo->bocommon;
+                       $this->soadmin_entity = 
CreateObject('property.soadmin_entity');
                        $this->acl = & $GLOBALS['phpgw']->acl;
                        $this->acl_location = 
'.document';//$this->bo->acl_location;
                        $this->acl_read = 
$this->acl->check($this->acl_location, PHPGW_ACL_READ, 'property');
@@ -426,6 +427,7 @@
                                        (
                                        array('key' => 'id', 'label' => 
lang('id'), 'sortable' => false, 'resizeable' => true),
                                        array('key' => 'name', 'label' => 
lang('Benevnelse'), 'sortable' => false, 'resizeable' => true),
+                                       array('key' => 'category', 'label' => 
lang('Category'), 'sortable' => false, 'resizeable' => true),
                                        array('key' => 'relate', 'label' => 
lang('related'), 'sortable' => false, 'resizeable' => true),
                                );
 
@@ -579,7 +581,7 @@
 
                        if (!$location_filter)
                        {
-                               $this->soadmin_entity = 
CreateObject('property.soadmin_entity');
+                               //$this->soadmin_entity = 
CreateObject('property.soadmin_entity');
                                $entity_list = 
$this->soadmin_entity->read(array('allrows' => true));
 
                                $location_filter = array();
@@ -691,7 +693,44 @@
                        $search = phpgw::get_var('search');
                        $draw = phpgw::get_var('draw', 'int');
                        $only_related = phpgw::get_var('only_related', 
'boolean');
+                       $all_types = phpgw::get_var('all_types', 'boolean');
+                       $entity_group_id = phpgw::get_var('entity_group_id');
+                                               
+                       $entity_list = 
$this->soadmin_entity->read(array('allrows' => true));
+                       $e_list = array();
+                       foreach($entity_list as $entity)
+                       {
+                               $e_list[$entity['id']] = $entity['name'];
+                       }
+                               
+                       if ($all_types)
+                       {
+                               $result = 
$this->bo->get_file_relations_componentes(array(
+                                       'start' => phpgw::get_var('start', 
'int', 'REQUEST', 0),
+                                       'results' => phpgw::get_var('length', 
'int', 'REQUEST', 0),
+                                       'allrows' => phpgw::get_var('length', 
'int') == -1,
+                                       'file_id' => $file_id,
+                                       'entity_group_id' => $entity_group_id
+                                       ));
 
+                               $values = array();
+                               foreach($result as $item)
+                               {
+                                       $values[] = array(
+                                               'id' => '<a 
href="'.self::link(array('menuaction' => 'property.uientity.view', 
'location_id' => $item['location_id'], 'id' => 
$item['id'])).'">'.$item['id'].'</a>',
+                                               'name' => $item['benevnelse'],
+                                               'category' => 
$e_list[$item['entity_id']].'::'.$item['category_name'],
+                                               'relate' => '<input 
value="'.$item['id'].'" class="components mychecks" type="checkbox" 
checked="checked"><input type="hidden" class="components_related" 
value="'.$item['id'].'">',
+                                       );
+                               }
+
+                               $result_data = array('results' => $values);
+                               $result_data['total_records'] = 
$this->bo->total_records_componentes;
+                               $result_data['draw'] = $draw;
+
+                               return $this->jquery_results($result_data);
+                       }
+               
             $soentity = CreateObject('property.soentity');
             $_components = $soentity->read( array(
                 'start' => phpgw::get_var('start', 'int', 'REQUEST', 0),
@@ -702,6 +741,7 @@
                 'location_id' => $location_id,
                 'filter_item' => array()
                 ));
+                       $category = 
$this->soadmin_entity->get_single_category($location_id, true);
 
                        if ($file_id)
                        {
@@ -730,6 +770,7 @@
                                $values[] = array(
                                        'id' => '<a 
href="'.self::link(array('menuaction' => 'property.uientity.view', 
'location_id' => $location_id, 'id' => $item['id'])).'">'.$item['id'].'</a>',
                                        'name' => $item['benevnelse'],
+                                       'category' => 
$e_list[$item['entity_id']].''.$category['name'],
                                        'relate' => '<input 
value="'.$item['id'].'" class="components mychecks" type="checkbox" 
'.$checked.'>'.$hidden,
                                );
                        }