[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12944] validation for entity class
From: |
Alejandro |
Subject: |
[Fmsystem-commits] [12944] validation for entity class |
Date: |
Thu, 02 Apr 2015 00:46:06 +0000 |
Revision: 12944
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12944
Author: nudrick
Date: 2015-04-02 00:46:05 +0000 (Thu, 02 Apr 2015)
Log Message:
-----------
validation for entity class
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.uientity.inc.php
Modified: branches/dev-syncromind/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uientity.inc.php 2015-04-02
00:45:52 UTC (rev 12943)
+++ branches/dev-syncromind/property/inc/class.uientity.inc.php 2015-04-02
00:46:05 UTC (rev 12944)
@@ -1526,8 +1526,6 @@
$values =
$this->bocommon->preserve_attribute_values($values,$values_attribute);
}
- $lookup_type = $mode == 'edit' ? 'form' : 'view';
-
$entity =
$this->soadmin_entity->read_single($this->entity_id);
if ($id)
@@ -1545,6 +1543,7 @@
}
$lookup_entity = array();
+
if (isset($entity['lookup_entity']) &&
is_array($entity['lookup_entity']))
{
foreach ($entity['lookup_entity'] as $lookup_id)
@@ -1580,6 +1579,8 @@
}
$location_data = array();
+
+ $lookup_type = $mode == 'edit' ? 'form2' : 'view2';
if($entity['location_form'] &&
$category['location_level'] > 0)
{
@@ -2073,7 +2074,7 @@
'attributes_general'
=> array('attributes' => $attributes_general),
'lookup_functions'
=> isset($values['lookup_functions'])?$values['lookup_functions']:'',
'lang_none'
=> lang('None'),
- 'location_data'
=> $location_data,
+ 'location_data2'
=> $location_data,
'lookup_type'
=> $lookup_type,
'mode'
=> $mode,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -2097,6 +2098,8 @@
'lean'
=> $_lean ? 1 : 0,
'validator' =>
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'))
);
+
+ //print_r($data['location_data2']);die;
$appname = $entity['name'];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12944] validation for entity class,
Alejandro <=