[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10504] Merge 10495:10503 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10504] Merge 10495:10503 from trunk |
|
Date: |
Tue, 13 Nov 2012 10:28:37 +0000 |
Revision: 10504
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10504
Author: sigurdne
Date: 2012-11-13 10:28:37 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
Merge 10495:10503 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.socommon.inc.php
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-1_0-branch/property/inc/class.boadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.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,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494
+
/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,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503
Modified: branches/Version-1_0-branch/logistic/inc/class.socommon.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.socommon.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/logistic/inc/class.socommon.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -36,7 +36,7 @@
public function __construct()
{
- $this->db = clone
$GLOBALS['phpgw']->db;
+ $this->db = &
$GLOBALS['phpgw']->db;
$this->like = & $this->db->like;
$this->join = & $this->db->join;
$this->left_join = & $this->db->left_join;
@@ -221,17 +221,21 @@
}
// test-input for break on ordered queries
- $db2 = clone($this->db);
+ $db = & $this->db;
+ $db2 = clone $this->db;
$sql = $this->get_query($sort_field, $ascending,
$search_for, $search_type, $filters, false);
$sql_parts = explode('1=1',$sql); // Split the query to
insert extra condition on test for break
- $this->db->query($sql,__LINE__, __FILE__, false, true);
- while ($this->db->next_record()) // Runs through all of
the results
+// $db->set_fetch_single(true);
+
+ $db->query($sql,__LINE__, __FILE__);
+
+ while ($db->next_record()) // Runs through all of the
results
{
$should_populate_object = false; // Default
value - we won't populate object
- $result_id =
$this->unmarshal($this->db->f($id_field_name), 'int'); // The id of object
+ $result_id =
$this->unmarshal($db->f($id_field_name), 'int'); // The id of object
if(in_array($result_id, $added_object_ids)) //
Object with this id already added
{
@@ -291,7 +295,7 @@
}
}
}
-
+ $db->set_fetch_single(false);
return $results;
}
Modified:
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -224,4 +224,4 @@
}
return self::$so;
}
- }
\ No newline at end of file
+ }
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -4,6 +4,8 @@
* phpGroupWare - logistic: a part of a Facilities Management System.
*
* @author Erik Holm-Larsen <address@hidden>
+ * @author Torstein Vadla <address@hidden>
+ * @author Sigurd Nes <address@hidden>
* @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
* This file is part of phpGroupWare.
*
@@ -42,7 +44,7 @@
private $so_project;
private $so_requirement;
private $so_resource_allocation;
-
+
public $public_functions = array(
'query' => true,
'add' => true,
@@ -62,17 +64,17 @@
$this->so_project = createObject('logistic.soproject');
$this->so_requirement =
CreateObject('logistic.sorequirement');
$this->so_resource_allocation =
CreateObject('logistic.sorequirement_resource_allocation');
-
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"logistic::project::activity";
}
-
+
public function index()
{
if (phpgw::get_var('phpgw_return_as') == 'json')
{
return $this->query();
}
-
+
self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -125,7 +127,7 @@
'label' => lang('Id'),
'sortable' => true,
'formatter' =>
'YAHOO.portico.formatLink'
- ),
+ ),
array(
'key' => 'name',
'label' =>
lang('Activity name'),
@@ -188,7 +190,19 @@
)
);
+ $parameters3 = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' =>
'activity_id',
+ 'source' => 'id'
+ ),
+ )
+ );
+
$data['datatable']['actions'][] = array
(
'my_name' =>
'new',
@@ -208,7 +222,7 @@
(
'menuaction' =>
'logistic.uirequirement.edit'
)),
- 'parameters' =>
json_encode($parameters)
+ 'parameters' =>
json_encode($parameters3)
);
$data['datatable']['actions'][] = array
@@ -256,17 +270,17 @@
{
$user_rows_per_page = 10;
}
-
+
// YUI variables for paging and sorting
$start_index = phpgw::get_var('startIndex', 'int');
$num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
$sort_field = phpgw::get_var('sort');
$sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
-
+
// Form variables
$search_for = phpgw::get_var('query');
$search_type = phpgw::get_var('search_option');
-
+
// Create an empty result set
$result_objects = array();
$result_count = 0;
@@ -290,7 +304,7 @@
$filters = array('id' => $activity_id);
$result_objects =
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending,
$search_for, $search_type, $filters);
$object_count =
$this->so->get_count($search_for, $search_type, $filters);
-
+
array_shift($result_objects);
break;
case 'activity_id':
@@ -315,23 +329,23 @@
{
$filters = array('activity' =>
$activity->get_id());
$requirements_for_activity =
$this->so_requirement->get($start_index, $num_of_objects, $sort_field,
$sort_ascending, $search_for, $search_type, $filters);
-
+
if( count( $requirements_for_activity )
> 0 )
{
$total_num_alloc = 0;
$total_num_required = 0;
-
+
foreach($requirements_for_activity as $requirement)
{
$filters =
array('requirement_id' => $requirement->get_id());
- $num_allocated =
$this->so_resource_allocation->get_count($search_for, $search_type, $filters);
+ $num_allocated =
$this->so_resource_allocation->get_count($search_for, $search_type, $filters);
$num_required =
$requirement->get_no_of_items();
-
+
$total_num_alloc +=
$num_allocated;
$total_num_required +=
$num_required;
}
-
+
if($total_num_alloc ==
$total_num_required)
{
$status = "Behov
dekket";
@@ -345,22 +359,22 @@
{
$status = "Ingen registerte
behov";
}
-
+
$activity_arr = $activity->serialize();
-
+
$activity_arr['status'] = $status;
-
-
+
+
$href = self::link(array('menuaction'
=> 'logistic.uiactivity.view', 'id' => $activity_arr['id']));
$activity_arr['id_link'] = "<a
href=\"{$href}\">" . $activity_arr['id'] . "</a>";
$activity_arr['name'] = "<a
href=\"{$href}\">" . $activity_arr['name'] . "</a>";
-
-
+
+
$rows[] = $activity_arr;
}
}
-
-
+
+
// ... add result data
$result_data = array('results' => $rows);
@@ -395,11 +409,11 @@
public function edit($activity = null)
{
$activity_id = phpgw::get_var('id');
- $parent_activity_id = phpgw::get_var('parent_id');
+ $parent_activity_id = phpgw::get_var('parent_id',
'int');
$project_id = phpgw::get_var('project_id');
-
+
if($activity == null)
- {
+ {
if( $activity_id && is_numeric($activity_id) )
{
$activity =
$this->so->get_single($activity_id);
@@ -407,26 +421,27 @@
else
{
$activity = new logistic_activity();
-
+
if( $project_id &&
is_numeric($project_id) )
{
$project =
$this->so_project->get_single($project_id);
$activity->set_project_id(
$project_id );
}
- else if($parent_activity_id > 0)
+ else if($parent_activity_id)
{
$activity->set_parent_id(
$parent_activity_id );
$parent_activity =
$this->so->get_single( $parent_activity_id );
- $activity->set_project_id(
$parent_activity->get_project_id() );
-
+ $project_id =
$parent_activity->get_project_id();
+ $activity->set_project_id(
$project_id );
+
$activity->set_start_date($parent_activity->get_start_date());
$activity->set_end_date($parent_activity->get_end_date());
}
}
}
-
+
$accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
-
+
$activities = $this->so->get();
if($activity_id)
@@ -452,19 +467,20 @@
$data = array
(
'responsible_users' => $accounts,
- 'activities' => $activity_id ? $activities :
array(),
+ 'activities' => $project_id ? $activities :
array(),
'activity' => $activity,
'editable' => true,
'breadcrumb' => $this->_get_breadcrumb(
$activity_id, 'logistic.uiactivity.edit', 'id')
);
-
+
if($project)
{
$data['project'] = $project;
}
-
-// if($activity->get_parent_id() > 0)
- if( $activity_id )
+
+// if($activity->get_parent_id() || $activity_id)
+// if( $activity_id )
+ if($project_id)
{
$parent_activity = $this->so->get_single(
$activity->get_parent_id() );
$data['parent_activity'] = $parent_activity;
@@ -474,21 +490,21 @@
$projects = $this->so_project->get();
$data['projects'] = $projects;
}
-
+
$this->use_yui_editor('description');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Add activity');
$GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
$GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
-
+
self::add_javascript('logistic', 'logistic',
'activity.js');
self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
self::add_javascript('phpgwapi', 'yui3',
'gallery-formvalidator/gallery-formvalidator-min.js');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
-
+//_debug_array($data);die();
self::render_template_xsl('activity/add_activity_item',
$data);
}
-
+
public function view()
{
$activity_id = phpgw::get_var('id', 'int');
@@ -496,7 +512,7 @@
if ($activity_id && is_numeric($activity_id))
{
$activity = $this->so->get_single( $activity_id
);
-
+
$responsible_user =
$this->so->get_responsible_user( $activity->get_responsible_user_id() );
$activity->set_responsible_user_name(
$responsible_user );
@@ -504,7 +520,7 @@
}
$tabs = $this->make_tab_menu($activity_id);
-
+
$data = array
(
'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($tabs, 0),
@@ -518,14 +534,14 @@
$parent_activity =
$this->so->get_single($activity->get_parent_id());
$data['parent_activity'] = $parent_activity;
}
-
+
self::render_template_xsl(array('activity/view_activity_item',
'activity/activity_tabs'), $data);
}
-
+
public function save()
{
$activity_id = phpgw::get_var('id');
-
+
if ($activity_id && is_numeric($activity_id))
{
$activity = $this->so->get_single($activity_id);
@@ -540,7 +556,7 @@
if( $activity->validate() )
{
$activity_id = $this->so->store($activity);
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.view', 'id' => $activity_id,
'project_id' => $activity->get_project_id()));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.view', 'id' => $activity_id,
'project_id' => $activity->get_project_id()));
}
else
{
@@ -578,14 +594,14 @@
$GLOBALS['phpgw']->preferences->save_repository();
execMethod('phpgwapi.menu.clear');
}
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.index'));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.index'));
}
-
+
public function view_resource_allocation()
{
$activity_id = phpgw::get_var('activity_id');
$activity = $this->so->get_single($activity_id);
-
+
$data = array(
'form' => array(
'toolbar' => array(
@@ -667,21 +683,23 @@
)
),
);
-
+
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
phpgwapi_jquery::load_widget('core');
$tabs = $this->make_tab_menu($activity_id);
-
+
$data['tabs'] =
$GLOBALS['phpgw']->common->create_tabs($tabs, 1);
$data['view'] = 'requirement_overview';
$data['activity'] = $activity;
$data['breadcrumb'] = $this->_get_breadcrumb(
$activity_id, 'logistic.uiactivity.view_resource_allocation', 'activity_id');
-
- self::add_javascript('logistic', 'logistic',
'activity.js');
+
self::add_javascript('logistic', 'logistic',
'resource_allocation.js');
self::add_javascript('logistic', 'logistic',
'requirement.js');
+ self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+
self::render_template_xsl(array('activity/view_activity_item',
'requirement/requirement_overview', 'activity/activity_tabs'), $data);
}
@@ -700,7 +718,7 @@
return $user_array;
}
-
+
function make_tab_menu($activity_id)
{
$tabs = array();
@@ -737,9 +755,9 @@
{
return;
}
-
+
$path = $this->so->get_path($activity_id);
-
+
foreach($path as $menu_item)
{
if($menu_item['id'] == $activity_id)
@@ -751,9 +769,9 @@
$_link = self::link(array('menuaction'
=> $menuaction, $id_name => $menu_item['id'] ));
$breadcrumb_array[] = array("name" =>
$menu_item['name'], "link" => $_link, "current" => 0);
}
-
+
}
-
+
return $breadcrumb_array;
}
}
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -307,6 +307,13 @@
public function view()
{
+ if( $nonavbar = phpgw::get_var('nonavbar', 'bool'))
+ {
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] =
$nonavbar;
+ $GLOBALS['phpgw_info']['flags']['noheader_xsl']
= true;
+ $GLOBALS['phpgw_info']['flags']['nofooter']
= true;
+ }
+
$requirement_id = phpgw::get_var('id');
if(isset($_POST['edit_requirement']))
@@ -347,6 +354,13 @@
public function edit($requirement = null)
{
+ if( $nonavbar = phpgw::get_var('nonavbar', 'bool'))
+ {
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] =
$nonavbar;
+ $GLOBALS['phpgw_info']['flags']['noheader_xsl']
= true;
+ $GLOBALS['phpgw_info']['flags']['nofooter']
= true;
+ }
+
$requirement_id = phpgw::get_var('id');
$activity_id = phpgw::get_var('activity_id');
@@ -367,6 +381,8 @@
if ($activity_id && is_numeric($activity_id))
{
$activity =
$this->so_activity->get_single( $activity_id );
+
$requirement->set_start_date($activity->get_start_date());
+
$requirement->set_end_date($activity->get_end_date());
$project =
$this->so_project->get_single( $activity->get_project_id() );
}
}
@@ -414,11 +430,12 @@
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
- 'view'
=> "requirement_details",
- 'requirement' => $requirement,
+ 'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($tabs, 0),
+ 'view' =>
"requirement_details",
+ 'requirement' => $requirement,
'distict_locations' => $distict_locations_array,
- 'editable' => true,
+ 'editable' => true,
+ 'nonavbar' => $nonavbar
);
if($activity_id > 0)
@@ -439,11 +456,19 @@
public function save()
{
- $requirement_id = phpgw::get_var('id');
+ $requirement_id = phpgw::get_var('id', 'int');
$new_location_id = phpgw::get_var('location_id');
- if ($requirement_id && is_numeric($requirement_id))
+ if( $nonavbar = phpgw::get_var('nonavbar', 'bool'))
{
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] =
$nonavbar;
+ $GLOBALS['phpgw_info']['flags']['noheader_xsl']
= true;
+ $GLOBALS['phpgw_info']['flags']['nofooter']
= true;
+ }
+
+
+ if ($requirement_id)
+ {
$requirement =
$this->so->get_single($requirement_id);
$old_location_id =
$requirement->get_location_id();
}
@@ -456,8 +481,9 @@
if( $requirement->validate() )
{
- $db_requirement = $this->so->get_db();
- $db_requirement->transaction_begin();
+// $db_requirement = $this->so->get_db();
+// $db_requirement->transaction_begin();
+ $GLOBALS['phpgw']->db->transaction_begin();
$requirement_id =
$this->so->store($requirement);
$status_delete_values = true;
@@ -469,14 +495,16 @@
if( ($requirement_id > 0) &&
($status_delete_values) && ($status_delete_resources) )
{
- $db_requirement->transaction_commit();
+// $db_requirement->transaction_commit();
+
$GLOBALS['phpgw']->db->transaction_commit();
}
else
{
- $db_requirement->transaction_abort();
+
$GLOBALS['phpgw']->db->transaction_commit();
+// $db_requirement->transaction_abort();
}
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id,
'nonavbar' => $nonavbar));
}
else
{
Modified:
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -68,11 +68,11 @@
{
parent::__construct();
- $this->so
=
createObject('logistic.sorequirement_resource_allocation');
- $this->so_activity
= createObject('logistic.soactivity');
- $this->so_requirement =
createObject('logistic.sorequirement');
+ $this->so =
createObject('logistic.sorequirement_resource_allocation');
+ $this->so_activity =
createObject('logistic.soactivity');
+ $this->so_requirement =
createObject('logistic.sorequirement');
$this->so_requirement_value =
CreateObject('logistic.sorequirement_value');
-
+
$this->bo
= CreateObject('property.bolocation',true);
$this->bocommon
= & $this->bo->bocommon;
@@ -161,8 +161,8 @@
),
)
),
- );
-
+ );
+
self::render_template_xsl(array('datatable_common'),
$data);
}
@@ -185,13 +185,13 @@
{
$user_rows_per_page = 10;
}
-
+
// YUI variables for paging and sorting
$start_index = phpgw::get_var('startIndex', 'int');
$num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
$sort_field = phpgw::get_var('sort');
$sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
-
+
// Form variables
$search_for = phpgw::get_var('query');
$search_type = phpgw::get_var('search_option');
@@ -230,8 +230,14 @@
{
if (isset($result))
{
- $requirement = $result->serialize();
-
+ $requirement = $result->serialize();
+
+ if($short_desc =
execMethod('property.soentity.get_short_description',
+ array('location_id' =>
$requirement['location_id'], 'id' => $requirement['resource_id'])))
+ {
+
$requirement['fm_bim_item_name'] = $short_desc;
+ }
+
$delete_href = self::link(
array('menuaction' =>
'logistic.uirequirement_resource_allocation.delete',
'id' =>
$requirement['id'],
@@ -241,7 +247,7 @@
$rows[] = $requirement;
}
}
-
+
// ... add result data
$result_data = array('results' => $rows);
@@ -276,7 +282,7 @@
{
$activity =
$this->so_activity->get_single($activity_id);
}
-
+
if($requirement_id && is_numeric($requirement_id))
{
$requirement =
$this->so_requirement->get_single($requirement_id);
@@ -301,27 +307,27 @@
$requirement_values =
$this->so_requirement_value->get(null, null, null, null, null, null,
array('requirement_id' => $requirement->get_id()));
$criterias_array = array();
-
+
$location_id = $requirement->get_location_id();
-
+
$loc_arr =
$GLOBALS['phpgw']->locations->get_name($location_id);
$entity_arr = explode('.',$loc_arr['location']);
$entity_id = $entity_arr[2];
$cat_id = $entity_arr[3];
-
+
$criterias_array['location_id'] = $location_id;
$criterias_array['allrows'] = true;
-
+
$view_criterias_array = array();
$custom =
createObject('phpgwapi.custom_fields');
-
+
foreach($requirement_values as
$requirement_value)
{
$attrib_value =
$requirement_value->get_value();
$operator =
$requirement_value->get_operator();
$cust_attribute_id =
$requirement_value->get_cust_attribute_id();
-
+
if($operator == "eq")
{
$operator_str = "=";
@@ -348,47 +354,47 @@
'value'
=> $attrib_value,
'attribute_id' =>
$cust_attribute_id
);
-
+
$criterias_array['conditions'][] =
$condition;
}
}
$so_entity =
CreateObject('property.soentity',$entity_id,$cat_id);
$allocation_suggestions =
$so_entity->get_eav_list($criterias_array);
-
+
$activity = $this->so_activity->get_single(
$requirement->get_activity_id() );
-
+
$data = array
(
- 'requirement'
=> $requirement,
+ 'requirement' =>
$requirement,
'view_criterias_array' =>
$view_criterias_array,
- 'activity'
=> $activity,
+ 'activity'
=> $activity,
'allocation_suggestions' =>
$allocation_suggestions,
- 'editable'
=> true
+ 'editable'
=> true
);
-
+
self::render_template_xsl(array('allocation/book_resources'), $data);
}
public function save()
{
$requirement_id = phpgw::get_var('requirement_id');
-
+
if($requirement_id && is_numeric($requirement_id))
{
$requirement =
$this->so_requirement->get_single($requirement_id);
}
-
+
$user_id = $GLOBALS['phpgw_info']['user']['id'];
$chosen_resources = phpgw::get_var('chosen_resources');
-
+
$filters = array('requirement_id' =>
$requirement->get_id());
- $num_allocated = $this->so->get_count($search_for,
$search_type, $filters);
-
+ $num_allocated = $this->so->get_count($search_for,
$search_type, $filters);
+
$num_required = $requirement->get_no_of_items();
-
+
$num_allowed_bookings = $num_required - $num_allocated;
-
+
if( count($chosen_resources) <= $num_allowed_bookings)
{
foreach($chosen_resources as $resource_id)
@@ -398,10 +404,10 @@
$resource_alloc->set_resource_id(
$resource_id );
$resource_alloc->set_location_id(
$requirement->get_location_id() );
$resource_alloc->set_create_user(
$user_id );
-
+
$resource_alloc_id = $this->so->store(
$resource_alloc );
}
-
+
$activity =
$this->so_activity->get_single($requirement->get_activity_id());
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.view_resource_allocation',
'activity_id' => $requirement->get_activity_id()));
@@ -411,13 +417,13 @@
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiactivity.view_resource_allocation',
'activity_id' => $requirement->get_activity_id()));
}
}
-
+
public function delete()
{
$resource_allocation_id = phpgw::get_var('id');
-
+
$status = $this->so->delete($resource_allocation_id);
-
+
if($status){
return json_encode( array( "status" =>
"deleted" ) );
}
@@ -425,7 +431,7 @@
return json_encode( array( "status" =>
"not_deleted" ) );
}
}
-
+
function convert_to_array($object_list)
{
$converted_array = array();
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
2012-11-12 14:40:28 UTC (rev 10503)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
2012-11-13 10:28:37 UTC (rev 10504)
@@ -36,7 +36,7 @@
<input type="hidden" name="parent_id"
value="{parent_activity/id}" />
<dl class="proplist-col">
- <xsl:value-of select="parent_activity/id"/>
+
<xsl:choose>
<xsl:when test="(editable) and
(activities !='')">
<dt>
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
2012-11-12 14:40:28 UTC (rev 10503)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
2012-11-13 10:28:37 UTC (rev 10504)
@@ -1,12 +1,19 @@
<xsl:template name="requirement_details" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')"/></xsl:variable>
<xsl:variable name="datetime_format"><xsl:value-of
select="$date_format"/><xsl:text> H:i</xsl:text></xsl:variable>
+<xsl:variable name="nonavbar"><xsl:value-of select="nonavbar"/></xsl:variable>
+<xsl:variable name="action_params">
+ <xsl:text>menuaction:logistic.uirequirement.save, nonavbar:</xsl:text>
+ <xsl:value-of select="nonavbar" />
+</xsl:variable>
+<xsl:variable name="action_url">
+ <xsl:value-of select="php:function('get_phpgw_link', '/index.php',
$action_params )" />
+</xsl:variable>
+
+
<div class="content-wrp">
<div id="details">
- <xsl:variable name="action_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:logistic.uirequirement.save')" />
- </xsl:variable>
<form action="{$action_url}" method="post">
<input type="hidden" name="id" value =
"{requirement/id}" />
<input type="hidden" id="activity_id"
name="activity_id" value="{activity/id}" />
@@ -14,6 +21,7 @@
<dl class="proplist-col">
<dt>
<label
for="start_date">Startdato</label>
+ <xsl:value-of select="$nonavbar"/>
</dt>
<dd>
<xsl:choose>
@@ -122,10 +130,10 @@
<xsl:variable name="view_resources_params">
<xsl:text>menuaction:logistic.uiactivity.view_resource_allocation,
activity_id:</xsl:text>
<xsl:value-of
select="activity/id" />
- </xsl:variable>
- <xsl:variable name="view_resources_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $view_resources_params )"
/>
</xsl:variable>
+ <xsl:variable name="view_resources_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $view_resources_params )"
/>
+ </xsl:variable>
<xsl:choose>
<xsl:when test="editable">
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-12 14:40:28 UTC (rev 10503)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-13 10:28:37 UTC (rev 10504)
@@ -18,6 +18,9 @@
<xsl:template name="requirement_overview" xmlns:php="http://php.net/xsl";>
<div id="resource_alloc_wrp" class="content-wrp">
+ <xsl:variable name="activity_id">
+ <xsl:value-of select="activity/id" />
+ </xsl:variable>
<xsl:variable name="add_req_params">
<xsl:text>menuaction:logistic.uirequirement.edit, activity_id:</xsl:text>
<xsl:value-of select="activity/id" />
@@ -27,7 +30,7 @@
</xsl:variable>
<h2 style="float:left;"><xsl:value-of
select="php:function('lang', 'Resource requirement')" /></h2>
- <a id="add-requirement-btn" class="btn focus"
href="{$add_req_url}"><xsl:value-of select="php:function('lang', 'Add
requirement')" /></a>
+ <a id="add-requirement-btn" class="btn focus"
onClick="load_requirement_edit({$activity_id});"><xsl:value-of
select="php:function('lang', 'Add requirement')" /></a>
<div style="clear:both;" id="paging"></div>
<div style="margin-bottom: 40px;"
id="requirement-container"></div>
@@ -40,6 +43,20 @@
<xsl:template name="datasource-def">
<script>
+
+ function load_requirement_edit( activity_id ){
+ var oArgs = {menuaction: 'logistic.uirequirement.edit',
activity_id:activity_id, nonavbar: true, lean: true};
+ var requestUrl = phpGWLink('index.php', oArgs);
+
+ TINY.box.show({iframe:requestUrl,
boxid:'frameless',width:750,height:450,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true, close: true,closejs:function(){closeJS_local()}});
+ }
+
+ function closeJS_local()
+ {
+ var reqUrl = '<xsl:value-of select="//datatable/source"/>';
+ YAHOO.portico.inlineTableHelper('requirement-container',
reqUrl, YAHOO.portico.columnDefs);
+ }
+
YAHOO.util.Event.onDOMReady(function(){
YAHOO.portico.columnDefs = [
@@ -98,4 +115,4 @@
YAHOO.portico.inlineTableHelper('allocation-container', requestUrl,
myColumnDefs);
}
</script>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -582,7 +582,10 @@
$column_name = $this->_db->f('column_name');
- $this->_oProc->DropColumn($table, false, $column_name);
+ if($table)
+ {
+ $this->_oProc->DropColumn($table, false,
$column_name);
+ }
if(!$doubled) // else: wait for it - another one is
coming
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db.inc.php 2012-11-12
14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db.inc.php 2012-11-13
10:28:37 UTC (rev 10504)
@@ -198,6 +198,7 @@
return true;
}
+
/**
* Open a connection to a database
*
@@ -209,7 +210,15 @@
*/
abstract public function connect($Database = null, $Host =
null, $User = null, $Password = null, $Port = null);
+ /**
+ * set_fetch_single:fetch single record from pdo-object, no
inpact on adodb
+ *
+ * @param bool $value true/false
+ */
+ abstract public function set_fetch_single($value = false);
+
+
/**
* Close a connection to a database - only needed for persistent
connections
*/
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -41,7 +41,18 @@
parent::__construct($query, $db_type, $delay_connect);
}
+
/**
+ * set_fetch_single:fetch single record from pdo-object, no
inpact on adodb
+ *
+ * @param bool $value true/false
+ */
+ public function set_fetch_single($value = false)
+ {
+ $this->fetch_single = $value;
+ }
+
+ /**
* Called when object is cloned
*/
public function __clone()
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -48,7 +48,18 @@
}
+
/**
+ * set_fetch_single:fetch single record from pdo-object
+ *
+ * @param bool $value true/false
+ */
+ public function set_fetch_single($value = false)
+ {
+ $this->fetch_single = $value;
+ }
+
+ /**
* Destructor
*/
public function __destruct()
@@ -337,11 +348,11 @@
* @param bool $fetch_single true for using fetch, false for
fetchAll
* @return integer current query id if sucesful and null if fails
*/
- public function query($sql, $line = '', $file = '', $exec =
false, $fetch_single = false)
+ public function query($sql, $line = '', $file = '', $exec =
false, $_fetch_single = false)
{
//_Debug_Array($sql);
$this->_get_fetchmode();
- $this->fetch_single = $fetch_single;
+ $fetch_single = $_fetch_single ? $_fetch_single :
$this->fetch_single;
if ( !$this->db )
{
@@ -374,16 +385,16 @@
$this->fetch_single =
$fetch_single;
}
*/
- if(!$fetch_single)
+ if($fetch_single)
{
- $this->resultSet =
$statement_object->fetchAll($this->pdo_fetchmode);
- }
- else
- {
$this->resultSet =
$statement_object->fetch($this->pdo_fetchmode);
$this->statement_object =
$statement_object;
unset($statement_object);
}
+ else
+ {
+ $this->resultSet =
$statement_object->fetchAll($this->pdo_fetchmode);
+ }
}
}
Modified: branches/Version-1_0-branch/property/inc/class.boadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boadmin_entity.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/property/inc/class.boadmin_entity.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -475,6 +475,7 @@
$receipt = array();
$attrib['appname'] = $this->type_app[$this->type];
$attrib['location'] =
".{$this->type}.{$attrib['entity_id']}.{$attrib['cat_id']}";
+ $attrib_table =
$GLOBALS['phpgw']->locations->get_attrib_table($attrib['appname'],
$attrib['location']);
if ( $action == 'edit' && $attrib['id'] )
{
if ( $this->custom->edit( $attrib ) )
@@ -488,7 +489,7 @@
}
else
{
- $id = $this->custom->add( $attrib );
+ $id = $this->custom->add( $attrib,
$attrib_table);
if ( $id <= 0 )
{
$receipt['error'][] = array('msg' =>
lang( 'Unable to add field' ));
Modified: branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -540,7 +540,10 @@
$values['descr'] =
$this->db->db_addslashes($values['descr']);
$values['id'] = $this->bocommon->next_id($table,
array('entity_id'=>$values['entity_id']));
- $location_id =
$GLOBALS['phpgw']->locations->add(".{$this->type}.{$values['entity_id']}.{$values['id']}",
$values['name'], $this->type_app[$this->type], true);
+
+ $custom_tbl = !$values['is_eav'] ?
"fm_{$this->type}_{$values['entity_id']}_{$values['id']}" : null;
+
+ $location_id =
$GLOBALS['phpgw']->locations->add(".{$this->type}.{$values['entity_id']}.{$values['id']}",
$values['name'], $this->type_app[$this->type], true, $custom_tbl, $c_function
= true);
if($values['parent_id'])
{
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2012-11-12 14:40:28 UTC (rev 10503)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2012-11-13 10:28:37 UTC (rev 10504)
@@ -304,6 +304,11 @@
if($this->table && $this->fields)
{
$metadata = $this->db->metadata($this->table);
+
+ if(phpgw::get_var('debug', 'bool'))
+ {
+ _debug_array($metadata);
+ }
foreach($this->fields as $field)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10504] Merge 10495:10503 from trunk,
Sigurd Nes <=