[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11268] Merge 11265:11267 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11268] Merge 11265:11267 from trunk |
|
Date: |
Tue, 27 Aug 2013 09:05:49 +0000 |
Revision: 11268
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11268
Author: sigurdne
Date: 2013-08-27 09:05:48 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Merge 11265:11267 from trunk
Modified Paths:
--------------
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/js/logistic/requirement_overview.js
branches/Version-1_0-branch/phpgwapi/templates/portico/head.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,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264
+
/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,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-08-27 09:02:30 UTC (rev 11267)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-08-27 09:05:48 UTC (rev 11268)
@@ -40,7 +40,7 @@
phpgw::import_class('phpgwapi.datetime');
phpgw::import_class('phpgwapi.jquery');
- class uirequirement extends phpgwapi_uicommon
+ class logistic_uirequirement extends phpgwapi_uicommon
{
private $so;
private $so_requirement_value;
@@ -200,7 +200,7 @@
$attrib_data =
$custom->get('property', $loc_arr['location'], $cust_attribute_id);
$_criterie =
$attrib_data['input_text'];
-
+
if(isset($attrib_data['choice']))
{
foreach
($attrib_data['choice'] as $_choice)
@@ -214,9 +214,9 @@
}
else
if($requirement_value->get_value())
{
- $_criterie .=
"::{$requirement_value->get_value()}";
+ $_criterie .=
"::{$requirement_value->get_value()}";
}
-
+
$criterias[] = $_criterie;
// $operator =
$requirement_value->get_operator();
@@ -231,29 +231,29 @@
{
$_checked = 'checked="checked"';
}
-
+
$num_required = $entry['no_of_items'];
$num_allocated =
$this->so_resource_allocation->count_allocated($entry['id']);
-
+
$entry['allocated'] = $num_allocated;
$entry['select'] = "<input
class=\"select_line\" type =\"radio\" {$_checked} name=\"values[select_line]\"
value=\"{$entry['id']}\">";
-
+
if($num_allocated == $num_required)
{
$entry['status'] = "OK";
-
+
$entry['alloc_link'] = "<span
class='btn-sm cancel'>Tildel ressurser</span>";
}
else
{
$num_remaining = $num_required -
$num_allocated;
$entry['status'] = "MANGLER (" .
$num_remaining . ")";
-
+
$href = self::link(array('menuaction'
=> 'logistic.uirequirement_resource_allocation.edit', 'requirement_id' =>
$entry['id']));
$entry['alloc_link'] = "<a
class=\"btn-sm alloc\" href=\"{$href}\">Tildel ressurser</a>";
}
-
+
//$href = self::link(array('menuaction' =>
'logistic.uirequirement.edit', 'id' => $entry['id']));
$href =
"javascript:load_requirement_edit_id({$entry['id']});";
$entry['edit_requirement_link'] = "<a
class=\"btn-sm alloc\" href=\"{$href}\">Endre behov</a>";
@@ -292,7 +292,7 @@
$activity_id = phpgw::get_var('activity_id');
$activity =
$this->so_activity->get_single($activity_id);
-
+
$data = array(
'datatable_name' => lang('requirement'),
'activity' => $activity,
@@ -406,9 +406,9 @@
}
$activity =
$this->so_activity->get_single($requirement->get_activity_id());
-
+
$location_info =
$GLOBALS['phpgw']->locations->get_name($requirement->get_location_id());
-
+
$tabs = $this->make_tab_menu($requirement_id);
$data = array
@@ -464,7 +464,7 @@
$project =
$this->so_project->get_single( $activity->get_project_id() );
}
}
-
+
$accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
$entity_list =
execMethod('property.soadmin_entity.read', array('allrows' => true));
@@ -531,12 +531,12 @@
self::render_template_xsl(array('requirement/requirement_tabs',
'requirement/requirement_item'), $data);
}
-
+
public function save()
{
$requirement_id = phpgw::get_var('id', 'int');
$new_location_id = phpgw::get_var('location_id');
-
+
if( $nonavbar = phpgw::get_var('nonavbar', 'bool'))
{
$GLOBALS['phpgw_info']['flags']['nonavbar'] =
$nonavbar;
@@ -547,7 +547,7 @@
if(!$this->read)
{
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id,
'nonavbar' => $nonavbar));
- return false; // in case redirect fail;
+ return false; // in case redirect fail;
}
if ($requirement_id)
@@ -559,23 +559,23 @@
{
$requirement = new logistic_requirement();
}
-
+
$requirement->populate();
-
+
if( $requirement->validate() )
{
// $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;
if( ($old_location_id > 0) &&
(is_numeric($old_location_id) ) && ($old_location_id != $new_location_id) )
{
$status_delete_values =
$this->so_requirement_value->delete_values( $requirement_id );
- $status_delete_resources =
$this->so_resource_allocation->delete_resources( $requirement_id );
+ $status_delete_resources =
$this->so_resource_allocation->delete_resources( $requirement_id );
}
-
+
if( ($requirement_id > 0) &&
($status_delete_values) && ($status_delete_resources) )
{
// $db_requirement->transaction_commit();
@@ -585,8 +585,8 @@
{
$GLOBALS['phpgw']->db->transaction_commit();
// $db_requirement->transaction_abort();
- }
-
+ }
+
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id,
'nonavbar' => $nonavbar));
}
else
@@ -607,7 +607,7 @@
try
{
$this->so_requirement_value->delete_values(
$requirement_id );
-
$this->so_resource_allocation->delete_resources( $requirement_id );
+
$this->so_resource_allocation->delete_resources( $requirement_id );
$this->so->delete( $requirement_id );
}
catch (Exception $e)
@@ -615,7 +615,7 @@
if($e)
{
$GLOBALS['phpgw']->db->transaction_abort();
-
+
$GLOBALS['phpgw']->log->error(array(
'text' =>
'uirequirement::delete() : error when trying to delete requirement: %1',
'p1' => $e->getMessage(),
@@ -630,7 +630,7 @@
}
$GLOBALS['phpgw']->db->transaction_commit();
}
-
+
public function add_requirement_values()
{
$requirement_id = phpgw::get_var('requirement_id');
@@ -819,7 +819,7 @@
$tabs = $this->make_tab_menu($requirement_id);
$activity = $this->so_activity->get_single(
$requirement->get_activity_id() );
-
+
$data = array
(
'tabs'
=>
$GLOBALS['phpgw']->common->create_tabs($tabs, 1),
@@ -833,8 +833,8 @@
}
public function save_requirement_values()
- {
- $requirement_id =
phpgw::get_var('requirement_id');
+ {
+ $requirement_id =
phpgw::get_var('requirement_id');
$attributes_array = array();
$attributes_array =
phpgw::get_var('cust_attributes');
@@ -859,8 +859,8 @@
}
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view_requirement_values',
'requirement_id' => $requirement_id, 'nonavbar' => $this->nonavbar));
- }
-
+ }
+
public function get_custom_attributes($location_id,
$activity_id)
{
if($location_id == "")
@@ -905,7 +905,24 @@
public function assign_job()
{
-
+ $assign_requirement = json_decode(str_replace('"',
'"', phpgw::get_var('assign_requirement')));
+
+ if(!$assign_requirement ||
!is_array($assign_requirement))
+ {
+ echo 'Nothing to do';
+ return;
+ }
+
+ foreach ($assign_requirement as $assign_entry)
+ {
+ $assign_arr = explode('_', $assign_entry);
+ $allocation_id = $assign_arr[0];
+ $location_id = $assign_arr[1];
+ $item_id = $assign_arr[2];
+ $inventory_id = (int)$assign_arr[3];
+ }
+
+ echo 'logistic_uirequirement::assign_job()';
}
private function make_tab_menu($requirement_id)
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
2013-08-27 09:02:30 UTC (rev 11267)
+++
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2013-08-27 09:05:48 UTC (rev 11268)
@@ -53,6 +53,11 @@
private $so_requirement;
private $so_requirement_value;
private $so;
+ private $read;
+ private $add;
+ private $edit;
+ private $delete;
+ private $manage;
public $public_functions = array(
'query' => true,
@@ -90,6 +95,12 @@
$this->allrows
= $this->bo->allrows;
$this->lookup
= $this->bo->lookup;
$this->location_code =
$this->bo->location_code;
+
+ $this->read =
$GLOBALS['phpgw']->acl->check('.activity', PHPGW_ACL_READ, 'logistic');//1
+ $this->add =
$GLOBALS['phpgw']->acl->check('.activity', PHPGW_ACL_ADD, 'logistic');//2
+ $this->edit =
$GLOBALS['phpgw']->acl->check('.activity', PHPGW_ACL_EDIT, 'logistic');//4
+ $this->delete =
$GLOBALS['phpgw']->acl->check('.activity', PHPGW_ACL_DELETE, 'logistic');//8
+ $this->manage =
$GLOBALS['phpgw']->acl->check('.activity', 16, 'logistic');//16
}
public function index()
@@ -277,11 +288,14 @@
'phpgw_return_as' =>
'json')
);
- $requirement['delete_link'] = "<a
class=\"btn-sm delete\" href=\"{$delete_href}\">{$lang_delete}</a>";
+ $delete_href =
"javascript:load_delete_allocation({$requirement['id']});";
+ $requirement['delete_link'] = "<a
class=\"btn-sm \" href=\"{$delete_href}\">{$lang_delete}</a>";
+
$assign_href =
"javascript:load_assign_task(document.assign_task, {$requirement['id']});";
- $requirement['assign_job'] = "<input
name='assign_requirement' type='checkbox'
value='{$requirement['id']}_{$requirement['location_id']}_{$requirement['resource_id']}'
/><a class=\"btn-sm assign\" href=\"{$assign_href}\">{$lang_assign}</a>";
+ $requirement['assign_job'] = "<input
name='assign_requirement' type='checkbox'
value='{$requirement['id']}_{$requirement['location_id']}_{$requirement['resource_id']}_{$requirement['inventory_id']}'
/>"
+ . "<a class=\"btn-sm assign\"
href=\"{$assign_href}\">{$lang_assign}</a>";
$rows[] = $requirement;
}
@@ -571,6 +585,11 @@
public function delete()
{
+ if(!$this->delete)
+ {
+ return array( "status" => "not_deleted" );
+ }
+
$resource_allocation_id = phpgw::get_var('id');
$status = $this->so->delete($resource_allocation_id);
Modified:
branches/Version-1_0-branch/logistic/js/logistic/requirement_overview.js
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/requirement_overview.js
2013-08-27 09:02:30 UTC (rev 11267)
+++ branches/Version-1_0-branch/logistic/js/logistic/requirement_overview.js
2013-08-27 09:05:48 UTC (rev 11268)
@@ -32,6 +32,27 @@
}
+ function load_delete_allocation( id ){
+ confirm_msg = 'Slette allokering?';
+ if(confirm(confirm_msg))
+ {
+ var oArgs = {menuaction:
'logistic.uirequirement_resource_allocation.delete', id:id};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var callback = { success: function(o){
+
//message_delete = YAHOO.lang.JSON.parse(o.responseText);
+
//console.log(message_delete);
+
YAHOO.portico.updateinlineTableHelper('requirement-container');
+
YAHOO.portico.updateinlineTableHelper('allocation-container');
+ },
+ failure:
function(o){window.alert('failed')},
+ timeout: 10000
+ };
+ var request = YAHOO.util.Connect.asyncRequest('POST',
requestUrl, callback);
+ }
+ }
+
+
function load_assign_task(frm, id ){
var assign_requirement = new Array();
@@ -72,15 +93,5 @@
function closeJS_local_allocation(requirement_id)
{
-
YAHOO.portico.updateinlineTableHelper('allocation-container');
-/*
- var oArgs = {
-
menuaction:'logistic.uirequirement_resource_allocation.index',
- requirement_id: requirement_id,
- type: "requirement_id"
- };
-
- var requestUrl = phpGWLink('index.php', oArgs,
true);
-*/
}
Modified: branches/Version-1_0-branch/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/portico/head.inc.php
2013-08-27 09:02:30 UTC (rev 11267)
+++ branches/Version-1_0-branch/phpgwapi/templates/portico/head.inc.php
2013-08-27 09:05:48 UTC (rev 11268)
@@ -39,10 +39,12 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/examples/treeview/assets/css/folders/tree.css');
phpgwapi_yui::load_widget('treeview');
phpgwapi_yui::load_widget('datasource');
- $javascripts[] = "/phpgwapi/templates/portico/js/menu.js";
+ if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'])
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'] ==
'ajax_menu')
+ {
+ $javascripts[] =
"/phpgwapi/templates/portico/js/menu.js";
+ }
}
-
phpgwapi_yui::load_widget('button');
$stylesheets = array();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11268] Merge 11265:11267 from trunk,
Sigurd Nes <=