[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14704] interlink
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14704] interlink |
|
Date: |
Sat, 06 Feb 2016 16:40:30 +0000 |
Revision: 14704
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14704
Author: sigurdne
Date: 2016-02-06 16:40:30 +0000 (Sat, 06 Feb 2016)
Log Message:
-----------
interlink
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.socommon_core.inc.php
branches/dev-syncromind/property/inc/class.soproject.inc.php
branches/dev-syncromind/property/inc/class.sorequest.inc.php
branches/dev-syncromind/property/inc/class.uiproject.inc.php
branches/dev-syncromind/property/inc/class.uirequest.inc.php
branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
branches/dev-syncromind/property/templates/base/project.xsl
Modified: branches/dev-syncromind/property/inc/class.socommon_core.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.socommon_core.inc.php
2016-02-05 19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/inc/class.socommon_core.inc.php
2016-02-06 16:40:30 UTC (rev 14704)
@@ -236,21 +236,12 @@
$interlink_data = array();
- if(isset($data['origin']) && is_array($data['origin']))
+ if(isset($data['origin']) && $data['origin'] &&
isset($data['origin_id']) && $data['origin_id'])
{
- if($data['origin'][0]['data'][0]['id'])
- {
- $data['origin_id'] =
$GLOBALS['phpgw']->locations->get_id('property',
$data['origin'][0]['location']);
- $data['origin_item_id'] =
$data['origin'][0]['data'][0]['id'];
- }
- }
-
- if(isset($data['origin_id']) && $data['origin_id'] &&
isset($data['origin_item_id']) && $data['origin_item_id'])
- {
$interlink_data = array
(
- 'location1_id' => $data['origin_id'],
- 'location1_item_id' =>
$data['origin_item_id'],
+ 'location1_id' =>
$GLOBALS['phpgw']->locations->get_id('property', $data['origin']),
+ 'location1_item_id' =>
$data['origin_id'],
'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', $location2),
'location2_item_id' => $id,
'account_id' => $this->account
Modified: branches/dev-syncromind/property/inc/class.soproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.soproject.inc.php
2016-02-05 19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/inc/class.soproject.inc.php
2016-02-06 16:40:30 UTC (rev 14704)
@@ -1223,14 +1223,14 @@
}
}
- if(is_array($project['origin']))
+ if(isset($project['origin']))
{
- if($project['origin'][0]['data'][0]['id'])
+ if($project['origin_id'])
{
$interlink_data = array
(
- 'location1_id' =>
$GLOBALS['phpgw']->locations->get_id('property',
$project['origin'][0]['location']),
- 'location1_item_id' =>
$project['origin'][0]['data'][0]['id'],
+ 'location1_id' =>
$GLOBALS['phpgw']->locations->get_id('property', $project['origin']),
+ 'location1_item_id' =>
$project['origin_id'],
'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.project'),
'location2_item_id' => $id,
'account_id' => $this->account
Modified: branches/dev-syncromind/property/inc/class.sorequest.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sorequest.inc.php
2016-02-05 19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/inc/class.sorequest.inc.php
2016-02-06 16:40:30 UTC (rev 14704)
@@ -1042,9 +1042,9 @@
$value_set['multiplier'] = $request['multiplier'] ?
(float)$request['multiplier'] : 1;
- if((isset($request['origin'][0]['location']) &&
$request['origin'][0]['location'] == '.project.condition_survey') &&
isset($request['origin'][0]['data'][0]['id']) &&
!$value_set['condition_survey_id'])
+ if((isset($request['origin']) && $request['origin'] ==
'.project.condition_survey') && isset($request['origin_id']) &&
!$value_set['condition_survey_id'])
{
- $value_set['condition_survey_id'] =
(int)$request['origin'][0]['data'][0]['id'];
+ $value_set['condition_survey_id'] =
(int)$request['origin_id'];
}
$cols = implode(',', array_keys($value_set));
Modified: branches/dev-syncromind/property/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiproject.inc.php
2016-02-05 19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/inc/class.uiproject.inc.php
2016-02-06 16:40:30 UTC (rev 14704)
@@ -876,6 +876,15 @@
}
}
+ if(!$id && $bypass)
+ {
+ $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
+ $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
+ }
+
return $values;
}
@@ -931,7 +940,6 @@
}
$id = phpgw::get_var('id', 'int');
- $add_request =
phpgw::get_var('add_request');
$values_attribute = phpgw::get_var('values_attribute');
$config = CreateObject('phpgwapi.config', 'property');
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
@@ -1135,7 +1143,7 @@
{
$GLOBALS['phpgw_info']['flags']['menu_selection'] .=
'::project';
- $id = (int)phpgw::get_var('id', 'int');
+ $id = isset($values['id']) && $values['id'] ?
$values['id'] : (int)phpgw::get_var('id', 'int');
if($mode == 'edit' && (!$this->acl_add &&
!$this->acl_edit))
{
@@ -1180,10 +1188,85 @@
$receipt = $this->bo->add_request($add_request,
$id);
}
+ $bolocation = CreateObject('property.bolocation');
+
+ // origin
+
+ if(!$id && $bypass)
+ {
+ $location_code =
phpgw::get_var('location_code');
+ $tenant_id =
phpgw::get_var('tenant_id', 'int');
+ $values['descr'] =
phpgw::get_var('descr');
+ $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
+ $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
+
+ $origin =
phpgw::get_var('origin');
+ $origin_id =
phpgw::get_var('origin_id', 'int');
+
+ if($origin == '.ticket' && $origin_id &&
!$values['descr'])
+ {
+ $boticket=
CreateObject('property.botts');
+ $ticket =
$boticket->read_single($origin_id);
+ $values['descr'] = $ticket['details'];
+ $values['name'] = $ticket['subject'] ?
$ticket['subject'] : $ticket['category_name'];
+ $ticket_notes =
$boticket->read_additional_notes($origin_id);
+ $i = count($ticket_notes)-1;
+
if(isset($ticket_notes[$i]['value_note']) && $ticket_notes[$i]['value_note'])
+ {
+ $values['descr'] .= ": " .
$ticket_notes[$i]['value_note'];
+ }
+ $values['contact_id'] =
$ticket['contact_id'];
+ $tts_status_create_project =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_create_project'])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_create_project']
: '';
+ if($tts_status_create_project)
+ {
+
$boticket->update_status(array('status' => $tts_status_create_project),
$origin_id);
+ }
+
+ if (
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['auto_create_project_from_ticket'])
+ &&
$GLOBALS['phpgw_info']['user']['preferences']['property']['auto_create_project_from_ticket']
== 'yes')
+ {
+ $auto_create = true;
+ }
+ }
+
+ if($p_entity_id && $p_cat_id)
+ {
+ if(!is_object($boadmin_entity))
+ {
+ $boadmin_entity =
CreateObject('property.boadmin_entity');
+ }
+
+ $entity_category =
$boadmin_entity->read_single_category($p_entity_id,$p_cat_id);
+
$values['p'][$p_entity_id]['p_cat_name'] = $entity_category['name'];
+ }
+
+ if($location_code)
+ {
+ $values['location_data'] =
$bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'p_num'=>$p_num,
'view' => true));
+ }
+
+ if(isset($origin) && $origin)
+ {
+ $interlink =
CreateObject('property.interlink');
+ unset($values['origin']);
+ unset($values['origin_id']);
+ $values['origin'][0]['location']=
$origin;
+ $values['origin'][0]['descr']=
$interlink->get_location_name($origin);
+ $values['origin'][0]['data'][]= array(
+ 'id' => $origin_id,
+ 'link' =>
$interlink->get_relation_link(array('location' => $origin), $origin_id),
+ );
+ }
+ }
+
+ // end origin
+
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
$config = CreateObject('phpgwapi.config', 'property');
$config->read();
- $bolocation = CreateObject('property.bolocation');
$record_history = array();
if($this->bypass_error || ((!$this->receipt['error'] ||
$add_request) && !$bypass) && $id)
Modified: branches/dev-syncromind/property/inc/class.uirequest.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uirequest.inc.php
2016-02-05 19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/inc/class.uirequest.inc.php
2016-02-06 16:40:30 UTC (rev 14704)
@@ -464,6 +464,15 @@
}
}
+ if(!$id && $bypass)
+ {
+ $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
+ $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
+ }
+
return $values;
}
@@ -1070,7 +1079,7 @@
function edit($values = array(), $mode = 'edit')
{
- $id = phpgw::get_var('id', 'int');
+ $id = isset($values['id']) && $values['id'] ?
$values['id'] : phpgw::get_var('id', 'int');
if(!$this->acl_add && !$this->acl_edit)
{
Modified: branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
2016-02-05 19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/inc/class.uiworkorder.inc.php
2016-02-06 16:40:30 UTC (rev 14704)
@@ -630,6 +630,15 @@
$origin = phpgw::get_var('origin');
$origin_id = phpgw::get_var('origin_id', 'int');
+ if(!$id)
+ {
+ $p_entity_id =
phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id =
phpgw::get_var('p_cat_id', 'int');
+ $values['p'][$p_entity_id]['p_entity_id']
= $p_entity_id;
+ $values['p'][$p_entity_id]['p_cat_id']
= $p_cat_id;
+ $values['p'][$p_entity_id]['p_num']
= phpgw::get_var('p_num');
+ }
+
if($origin == '.ticket' && $origin_id &&
!$values['descr'])
{
$boticket = CreateObject('property.botts');
Modified: branches/dev-syncromind/property/templates/base/project.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/project.xsl 2016-02-05
19:03:16 UTC (rev 14703)
+++ branches/dev-syncromind/property/templates/base/project.xsl 2016-02-06
16:40:30 UTC (rev 14704)
@@ -374,9 +374,11 @@
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Enter the budget')"/>
</xsl:attribute>
- <xsl:attribute
name="data-validation-optional">
-
<xsl:text>true</xsl:text>
- </xsl:attribute>
+ <xsl:if
test="not(value_project_id > 0) and mode='edit'">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+ </xsl:if>
</input>
<xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
<select
name="values[budget_year]">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14704] interlink,
Sigurd Nes <=