[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9428] Merge 9426:9427 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9428] Merge 9426:9427 from trunk |
|
Date: |
Wed, 23 May 2012 09:47:39 +0000 |
Revision: 9428
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9428
Author: sigurdne
Date: 2012-05-23 09:47:38 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Merge 9426:9427 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js
branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
branches/Version-1_0-branch/property/js/yahoo/property.js
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
+
/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
Modified: branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2012-05-23 09:46:50 UTC (rev 9427)
+++ branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2012-05-23 09:47:38 UTC (rev 9428)
@@ -52,7 +52,7 @@
$location_arr = explode('.',
$this->acl_location);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->bo =
CreateObject('property.boentity',true);
+ $this->bo =
CreateObject('property.boentity');
$this->bocommon = &
$this->bo->bocommon;
$this->soadmin_entity = &
$this->bo->soadmin_entity;
Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2012-05-23 09:46:50 UTC (rev 9427)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2012-05-23 09:47:38 UTC (rev 9428)
@@ -55,7 +55,7 @@
{
$GLOBALS['phpgw_info']['apps']['manual']['section'] =
'helpdesk.index';
$this->insert_links_on_header_state();
- $bo = CreateObject('property.botts',true);
+ $bo = CreateObject('property.botts');
$dry_run = false;
$second_display = phpgw::get_var('second_display',
'bool');
@@ -356,6 +356,8 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('frontend') . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->css->add_external_file('property/js/tinybox2/style.css');
+ $GLOBALS['phpgw']->js->validate_file('tinybox2',
'packed' , 'property');
$GLOBALS['phpgw']->js->validate_file('yahoo',
'helpdesk.list' , 'frontend');
$msglog =
phpgwapi_cache::session_get('frontend','msgbox');
@@ -370,7 +372,6 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend',
'helpdesk', 'datatable'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('app_data' => $data));
- //print_r( $GLOBALS['phpgw']->xslttpl->get_vars());
}
private function cmp($a, $b)
@@ -518,28 +519,15 @@
public function add_ticket()
{
-
$values = phpgw::get_var('values');
+ $p_entity_id = phpgw::get_var('p_entity_id', 'int');
+ $p_cat_id = phpgw::get_var('p_cat_id',
'int');
+ $p_num = phpgw::get_var('p_num');
+ $origin = phpgw::get_var('origin');
- $bypass = phpgw::get_var('bypass',
'bool');
- if($bypass)
+ if($p_entity_id && $p_cat_id && $p_num)
{
- $boadmin_entity =
CreateObject('property.boadmin_entity');
- $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($p_entity_id && $p_cat_id)
- {
- $entity_category =
$boadmin_entity->read_single_category($p_entity_id,$p_cat_id);
-
$values['p'][$p_entity_id]['p_cat_name'] = $entity_category['name'];
-
- $id = phpgw::get_var('p_num');
- $item =
execMethod('property.boentity.read_single',(array('id' => $id, 'entity_id' =>
$p_entity_id, 'cat_id' => $p_cat_id, 'view' => true)));
- }
-
+ $item =
execMethod('property.boentity.read_single',(array('id' => $p_num, 'entity_id'
=> $p_entity_id, 'cat_id' => $p_cat_id, 'view' => true)));
}
$bo = CreateObject('property.botts',true);
@@ -596,24 +584,24 @@
$default_group = 0;
}
- $ticket = array(
- 'origin' => null,
- 'origin_id' => null,
- 'cat_id' => $cat_id,
- 'group_id' => ($default_group
? $default_group : null),
- 'assignedto'=> $assignedto,
- 'priority' => 3,
- 'status' => 'O', // O = Open
- 'subject' => $values['title'],
- 'details' =>
$values['locationdesc'].":\n\n".$values['description'],
- 'apply' => lang('Apply'),
- 'contact_id'=> 0,
- 'location' => $location,
- 'location_code' =>
$this->location_code,
- 'street_name' =>
$location_details['street_name'],
- 'street_number' =>
$location_details['street_number'],
- 'location_name' =>
$location_details['loc1_name'],
- //'locationdesc' =>
$values['locationdesc']
+ $ticket = array
+ (
+ 'origin_id'
=> $GLOBALS['phpgw']->locations->get_id('property', $origin),
+ 'origin_item_id' =>
$p_num,
+ 'cat_id'
=> $cat_id,
+ 'group_id'
=> ($default_group ? $default_group : null),
+ 'assignedto' =>
$assignedto,
+ 'priority'
=> 3,
+ 'status'
=> 'O', // O = Open
+ 'subject'
=> $values['title'],
+ 'details'
=> $values['locationdesc'].":\n\n".$values['description'],
+ 'apply'
=> lang('Apply'),
+ 'contact_id' => 0,
+ 'location'
=> $location,
+ 'location_code' =>
$this->location_code,
+ 'street_name' =>
$location_details['street_name'],
+ 'street_number' =>
$location_details['street_number'],
+ 'location_name' =>
$location_details['loc1_name'],
);
$result = $bo->add($ticket);
@@ -622,7 +610,6 @@
$msglog['message'][] =
array('msg' => lang('Ticket added'));
$noform = true;
-
// Files
$values['file_name'] =
@str_replace(' ','_',$_FILES['file']['name']);
if($values['file_name'] &&
$result['id'])
@@ -685,10 +672,20 @@
}
}
+ $form_action_data = array
+ (
+ 'menuaction' =>
'frontend.uihelpdesk.add_ticket',
+ 'noframework' => '1',
+ 'origin' => $origin,
+ 'p_entity_id' => $p_entity_id,
+ 'p_cat_id' => $p_cat_id,
+ 'p_num' => $p_num,
+ );
+
$data = array(
'redirect' =>
isset($redirect) ? $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'frontend.uihelpdesk.index')) : null,
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog)),
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'frontend.uihelpdesk.add_ticket', 'noframework' => '1')),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$form_action_data),
'title' => $values['title'],
'locationdesc' =>
$values['locationdesc'],
'description' =>
$values['description'],
Modified: branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js
===================================================================
--- branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js
2012-05-23 09:46:50 UTC (rev 9427)
+++ branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js
2012-05-23 09:47:38 UTC (rev 9428)
@@ -73,7 +73,20 @@
{
var oArgs = {menuaction:'frontend.uihelpdesk.add_ticket',
noframework:'1'};
var sUrl = phpGWLink('index.php', oArgs);
-
+/*
+ TINY.box.show({
+ iframe:sUrl,
+ boxid:'frameless',
+ width:750,
+ height:450,
+ fixed:false,
+ maskid:'darkmask',
+ maskopacity:40,
+ mask:true,
+ animate:true,
+ close: true
+ });
+*/
var onDialogShow = function(e, args, o)
{
var frame = document.createElement('iframe');
Modified: branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
2012-05-23 09:46:50 UTC (rev 9427)
+++ branches/Version-1_0-branch/frontend/templates/base/helpdesk.xsl
2012-05-23 09:47:38 UTC (rev 9428)
@@ -130,10 +130,9 @@
<td>
</td>
<td >
- <li>
+
<xsl:apply-templates
select="custom_attributes/attributes"/>
- <hr/>
- </li>
+
</td>
</tr>
Modified: branches/Version-1_0-branch/property/js/yahoo/property.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property.js 2012-05-23
09:46:50 UTC (rev 9427)
+++ branches/Version-1_0-branch/property/js/yahoo/property.js 2012-05-23
09:47:38 UTC (rev 9428)
@@ -1489,8 +1489,7 @@
maskopacity:40,
mask:true,
animate:true,
- close: true,
- // closejs:function(){closeJS_local()}
+ close: true
});
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9428] Merge 9426:9427 from trunk,
Sigurd Nes <=