[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6850] Merge 6842:6849 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6850] Merge 6842:6849 from trunk |
|
Date: |
Wed, 26 Jan 2011 10:06:03 +0000 |
Revision: 6850
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6850
Author: sigurdne
Date: 2011-01-26 10:06:02 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
Merge 6842:6849 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/tts.xsl
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
+
/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
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2011-01-26 10:04:45 UTC (rev 6849)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2011-01-26 10:06:02 UTC (rev 6850)
@@ -123,17 +123,17 @@
$errors = $this->bo->validate($booking);
- if (strtotime($_POST['from_']) < $today[0])
- {
- if($_POST['recurring'] == 'on' ||
$_POST['outseason'] == 'on')
- {
- $errors['booking'] = lang('Can
not repeat from a date in the past');
- }
- else
- {
- $errors['booking'] = lang('Can
not create a booking in the past');
- }
- }
+# if (strtotime($_POST['from_']) < $today[0])
+# {
+# if($_POST['recurring'] == 'on' ||
$_POST['outseason'] == 'on')
+# {
+# $errors['booking'] = lang('Can
not repeat from a date in the past');
+# }
+# else
+# {
+# $errors['booking'] = lang('Can
not create a booking in the past');
+# }
+# }
if (!$allocation_id && $_POST['outseason'] ==
'on')
{
$errors['booking'] = lang('This booking
is not connected to a season');
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-01-26 10:04:45 UTC (rev 6849)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-01-26 10:06:02 UTC (rev 6850)
@@ -460,6 +460,8 @@
$this->db->query($sql,__LINE__,__FILE__);
+ $entity = array();
+ $uicols = array();
$i=0;
while ($this->db->next_record())
{
@@ -547,6 +549,7 @@
function add($ticket)
{
+
if(isset($ticket['location']) &&
is_array($ticket['location']))
{
foreach ($ticket['location'] as $input_name =>
$value)
@@ -567,29 +570,45 @@
$value_set[$input_name] =
$value;
}
}
+
+ if($ticket['extra']['p_num'] &&
$ticket['extra']['p_entity_id'] && $ticket['extra']['p_cat_id'])
+ {
+ $entity =
CreateObject('property.soadmin_entity');
+ $entity_category =
$entity->read_single_category($ticket['extra']['p_entity_id'],$ticket['extra']['p_cat_id']);
+ }
}
- $address = '';
+ $_address = array();
if(isset($ticket['street_name']) &&
$ticket['street_name'])
{
- $_address = array($ticket['street_name'],
$ticket['street_number']);
- $address =
$this->db->db_addslashes(implode(" ", $_address));
- unset($_address);
+ $_address[] = "{$ticket['street_name']}
{$ticket['street_number']}";
}
if(isset($ticket['location_name']) &&
$ticket['location_name'])
{
- $address .= '::' .
$this->db->db_addslashes($ticket['location_name']);
+ $_address[] = $ticket['location_name'];
}
if(isset($ticket['additional_info']) &&
$ticket['additional_info'])
{
foreach($ticket['additional_info'] as $key =>
$value)
{
- $address .= "::{$key}|{$value}";
+ if($value)
+ {
+ $_address[] = "{$key}|{$value}";
+ }
}
}
+ if(isset($entity_category) && $entity_category)
+ {
+ $_address[] =
"{$entity_category['name']}::{$ticket['extra']['p_num']}";
+ }
+
+ $address =
$this->db->db_addslashes(implode('::', $_address));
+
+ unset($_address);
+
$value_set['priority'] =
isset($ticket['priority'])?$ticket['priority']:0;
$value_set['user_id'] =
$GLOBALS['phpgw_info']['user']['account_id'];
$value_set['assignedto'] = $ticket['assignedto'];
@@ -765,12 +784,12 @@
if($oldcat_id ==0){$oldcat_id ='';}
if($old_order_cat_id ==0){$old_order_cat_id ='';}
- if($oldassigned ==0){$oldassigned ='';}
- if($oldgroup_id ==0){$oldgroup_id ='';}
+ if($oldassigned ==0){$oldassigned ='';}
+ if($oldgroup_id ==0){$oldgroup_id ='';}
- // Figure out and last note
+ // Figure out and last note
- $history_values =
$this->historylog->return_array(array(),array('C'),'history_timestamp','DESC',$id);
+ $history_values =
$this->historylog->return_array(array(),array('C'),'history_timestamp','DESC',$id);
$old_note = $history_values[0]['new_value'];
if(!$old_note)
@@ -778,7 +797,6 @@
$old_note = $this->db->f('details');
}
-
$this->db->transaction_begin();
/*
@@ -1003,27 +1021,44 @@
{
$value_set = array();
- $address = '';
+ $_address = array();
if(isset($ticket['street_name']) &&
$ticket['street_name'])
{
- $_address =
array($ticket['street_name'], $ticket['street_number']);
- $address =
$this->db->db_addslashes(implode(" ", $_address));
- unset($_address);
+ $_address[] =
"{$ticket['street_name']} {$ticket['street_number']}";
}
if(isset($ticket['location_name']) &&
$ticket['location_name'])
{
- $address .= '::' .
$this->db->db_addslashes($ticket['location_name']);
+ $_address[] =
$ticket['location_name'];
}
if(isset($ticket['additional_info']) &&
$ticket['additional_info'])
{
foreach($ticket['additional_info'] as $key => $value)
{
- $address .=
"::{$key}|{$value}";
+ if($value)
+ {
+ $_address[] =
"{$key}|{$value}";
+ }
}
}
+
+ if(isset($ticket['extra']['p_num']) &&
$ticket['extra']['p_num'] && $ticket['extra']['p_entity_id'] &&
$ticket['extra']['p_cat_id'])
+ {
+ $entity =
CreateObject('property.soadmin_entity');
+ $entity_category =
$entity->read_single_category($ticket['extra']['p_entity_id'],$ticket['extra']['p_cat_id']);
+ }
+
+ if(isset($entity_category) &&
$entity_category)
+ {
+ $_address[] =
"{$entity_category['name']}::{$ticket['extra']['p_num']}";
+ }
+
+ $address =
$this->db->db_addslashes(implode('::', $_address));
+
+ unset($_address);
+
$value_set['address'] = $address;
if (isset($ticket['location_code']) &&
$ticket['location_code'])
Modified: branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-01-26 10:04:45 UTC (rev 6849)
+++ branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-01-26 10:06:02 UTC (rev 6850)
@@ -2085,7 +2085,7 @@
if($roles)
{
- $tabs['roles'] = array('label' =>
lang('roles'), 'link' => '#roles');
+ $tabs['roles'] = array('label' =>
lang('contacts'), 'link' => '#roles');
}
//_debug_array($roles);die();
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-01-26 10:04:45 UTC (rev 6849)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-01-26 10:06:02 UTC (rev 6850)
@@ -2080,7 +2080,7 @@
if($access_order)
{
- if((!isset($values['make_order']) ||
!$values['make_order']) && (!isset($values['budget']) || !$values['budget']) )
+ if((isset($values['order_id']) &&
$values['order_id']) && (!isset($values['budget']) || !$values['budget']) )
{
$receipt['error'][]=array('msg'=>lang('budget') . ': ' . lang('Missing value'));
}
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-01-26 10:04:45 UTC (rev 6849)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-01-26 10:06:02 UTC (rev 6850)
@@ -4999,4 +4999,24 @@
}
}
+ /**
+ * Update property version from 0.9.17.607 to 0.9.17.608
+ * Add more room for address at tickets
+ *
+ */
+/*
+ $test[] = '0.9.17.607';
+ function property_upgrade0_9_17_608()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_tts_tickets','address',array('type'
=> 'varchar','precision' => '255','nullable' => True));
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.608';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+*/
+
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-01-26
10:04:45 UTC (rev 6849)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-01-26
10:06:02 UTC (rev 6850)
@@ -1169,6 +1169,7 @@
</td>
<td>
<xsl:value-of select="value_order_id"/>
+ <input
type="hidden" name="values[order_id]" value="{value_order_id}"></input>
</td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6850] Merge 6842:6849 from trunk,
Sigurd Nes <=