[Fmsystem-commits] [6948] Merge 6937:6947 from trunk

[Sigurd Nes]

Revision: 6948
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6948
Author:   sigurdne
Date:     2011-02-07 08:06:45 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
Merge 6937:6947 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.socommon.inc.php
    branches/Version-1_0-branch/property/inc/class.uientity.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947

Modified: branches/Version-1_0-branch/property/inc/class.socommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.socommon.inc.php     
2011-02-07 08:02:19 UTC (rev 6947)
+++ branches/Version-1_0-branch/property/inc/class.socommon.inc.php     
2011-02-07 08:06:45 UTC (rev 6948)
@@ -277,35 +277,33 @@
                }
                function get_lookup_entity($location)
                {
-                       $this->db->query("SELECT entity_id,name FROM 
fm_entity_lookup $this->join fm_entity on 
fm_entity_lookup.entity_id=fm_entity.id WHERE type='lookup' AND 
location='$location'  ");
-
-                       $i = 0;
-
+                       $this->db->query("SELECT entity_id,name FROM 
fm_entity_lookup {$this->join} fm_entity on 
fm_entity_lookup.entity_id=fm_entity.id WHERE type='lookup' AND 
location='{$location}'  ");
+                       $entity = array();
                        while ($this->db->next_record())
                        {
-                               $entity[$i]['id']                               
= $this->db->f('entity_id');
-                               $entity[$i]['name']                             
= $this->db->f('name');
-                               $i++;
+                               $entity[] = array
+                               (
+                                       'id'    => $this->db->f('entity_id'),
+                                       'name'  => $this->db->f('name',true)
+                               );
                        }
                        return $entity;
                }
 
                function get_start_entity($location)
                {
-                       $this->db->query("SELECT entity_id,name FROM 
fm_entity_lookup $this->join fm_entity on 
fm_entity_lookup.entity_id=fm_entity.id WHERE type='start' AND 
location='$location'  ");
+                       $this->db->query("SELECT entity_id,name FROM 
fm_entity_lookup {$this->join} fm_entity on 
fm_entity_lookup.entity_id=fm_entity.id WHERE type='start' AND 
location='{$location}'  ");
 
-                       $i = 0;
+                       $entity = array();
                        while ($this->db->next_record())
                        {
-                               $entity[$i]['id']                               
= $this->db->f('entity_id');
-                               $entity[$i]['name']                             
= $this->db->f('name');
-                               $i++;
+                               $entity[] = array
+                               (
+                                       'id'    => $this->db->f('entity_id'),
+                                       'name'  => $this->db->f('name',true)
+                               );
                        }
-
-                       if (isset($entity))
-                       {
-                               return $entity;
-                       }
+                       return $entity;
                }
 
                function increment_id($name)

Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php     
2011-02-07 08:02:19 UTC (rev 6947)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php     
2011-02-07 08:06:45 UTC (rev 6948)
@@ -1750,14 +1750,27 @@
  */                    
                        if ($id)
                        {
+                               $get_docs = false;
+                               $check_doc = 
$this->bocommon->get_lookup_entity('document');
+                               foreach ($check_doc as $_check)
+                               {
+                                       if ($_check['id'] == $this->entity_id)
+                                       {
+                                               $get_docs = true;
+                                               break;
+                                       }
+                               }
 
-                               $document = CreateObject('property.sodocument');
-                               $documents = 
$document->get_files_at_location(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'num'=>$values['num']));
+                               if($get_docs)
+                               {
+                                       $document = 
CreateObject('property.sodocument');
+                                       $documents = 
$document->get_files_at_location(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'num'=>$values['num']));
 
-                               if($documents)
-                               {
-                                       $tabs['document']       = array('label' 
=> lang('document'), 'link' => '#document');
-                                       $documents = json_encode($documents);   
                        
+                                       if($documents)
+                                       {
+                                               $tabs['document']       = 
array('label' => lang('document'), 'link' => '#document');
+                                               $documents = 
json_encode($documents);                           
+                                       }
                                }
 
                                $related = 
$this->bo->read_entity_to_link(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'id'=>$values['num']));