[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11310] Merge 11308:11309 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11310] Merge 11308:11309 from trunk |
|
Date: |
Fri, 20 Sep 2013 11:31:50 +0000 |
Revision: 11310
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11310
Author: sigurdne
Date: 2013-09-20 11:31:50 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Merge 11308:11309 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/hook_config.inc.php
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/config.tpl
branches/Version-1_0-branch/property/templates/base/project.xsl
branches/Version-1_0-branch/property/templates/base/request.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,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,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306
+
/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,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-09-20 11:31:50 UTC (rev 11310)
@@ -1729,7 +1729,7 @@
{
$this->db->query("UPDATE fm_request set
project_id = NULL where id='{$request_id}'",__LINE__,__FILE__);
$this->interlink->delete_at_origin('property',
'.project.request', '.project', $request_id, $this->db);
- $receipt['message'][] =
array('msg'=>lang('Request %1 has been deleted from project
%2',$request_id,$project_id));
+ $receipt['message'][] =
array('msg'=>lang('request %1 has been deleted from project
%2',$request_id,$project_id));
}
return $receipt;
}
@@ -2423,6 +2423,13 @@
$this->db->query("UPDATE fm_request SET
project_id='$id' WHERE id='". $add_request['request_id'][$i] .
"'",__LINE__,__FILE__);
+ $request_project_hookup_status =
isset($this->config->config_data['request_project_hookup_status']) &&
$this->config->config_data['request_project_hookup_status'] ?
$this->config->config_data['request_project_hookup_status'] : false;
+
+ if($request_project_hookup_status)
+ {
+ $this->db->query("UPDATE
fm_request SET status='{$request_project_hookup_status}' WHERE id='".
$add_request['request_id'][$i] . "'",__LINE__,__FILE__);
+ }
+
$receipt['message'][] =
array('msg'=>lang('request %1 has been added',$add_request['request_id'][$i]));
}
else
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2013-09-20 11:31:50 UTC (rev 11310)
@@ -2081,7 +2081,8 @@
'values' =>
json_encode($content_files),
'total_records' =>
count($content_files),
'edit_action' => "''",
- 'is_paginator' => 0,
+ 'is_paginator' => 1,
+ 'rows_per_page' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
'footer' => 0
);
@@ -2094,7 +2095,63 @@
//--------------files
+ $lang_delete_request_statustext = lang('Check to delete
this request from this project');
+ $_origin = array();
+ if(isset($values['origin']) && $values['origin'] )
+ {
+ foreach($values['origin'] as $__origin)
+ {
+ foreach ($__origin['data'] as
$_origin_data)
+ {
+ $_select = '';
+ if($__origin['location'] ==
'.project.request')
+ {
+ $_select = "<input
type=\"checkbox\" name=\"values[delete_request][]\"
value=\"{$_origin_data['id']}\" title=\"{$lang_delete_request_statustext}\">";
+ }
+ $_origin[] = array
+ (
+ 'url'
=> "<a href='{$_origin_data['link']}'>{$_origin_data['id']} </a>",
+ 'type'
=> $__origin['descr'],
+ 'title'
=> $_origin_data['title'],
+ 'status'
=> $_origin_data['statustext'],
+ // 'user'
=> $GLOBALS['phpgw']->accounts->get($_origin_data['account_id'])->__toString(),
+ // 'entry_date' =>
$GLOBALS['phpgw']->common->show_date($_origin_data['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
+ 'select'
=> $_select
+ );
+ }
+ }
+ }
+
+
+ $datavalues[6] = array
+ (
+ 'name' => "6",
+ 'values' =>
json_encode($_origin),
+ 'total_records' =>
count($_origin),
+ 'edit_action' => "''",
+ 'is_paginator' => 1,
+ 'rows_per_page' =>
5,//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+ 'footer' => 0
+ );
+
+ $myColumnDefs[6] = array
+ (
+ 'name' => "6",
+ 'values' => json_encode(array(
+ array('key' =>
'url','label'=>lang('id'),'sortable'=>true,'resizeable'=>true),
+ array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
+ array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'status','label'=>lang('status'),'sortable'=>false,'resizeable'=>true),
+ // array('key' =>
'user','label'=>lang('user'),'sortable'=>false,'resizeable'=>true),
+ // array('key' =>
'entry_date','label'=>lang('entry date'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'select','label'=>lang('select'),'sortable'=>false,'resizeable'=>true),
+ )
+ )
+ );
+
+
+
// _debug_array($myButtons);die();
//----------------------------------------------datatable settings--------
@@ -2156,6 +2213,7 @@
$property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
}
+
$data = array
(
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js),
@@ -2181,12 +2239,9 @@
'year_list'
=> array('options' => $year_list),
'order_time_span'
=> array('options' => $this->bo->get_order_time_span($id)),
'periodization_list'
=> array('options' => $periodization_list),
- 'lang_select_request'
=> lang('Select request'),
'lang_select_request_statustext'
=> lang('Add request for this project'),
'lang_request_statustext'
=> lang('Link to the request for this project'),
- 'lang_delete_request_statustext'
=> lang('Check to delete this request from this project'),
'link_select_request'
=> $GLOBALS['phpgw']->link('/index.php',$link_request_data),
- 'link_request'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uirequest.view')),
'add_sub_entry_action'
=> $GLOBALS['phpgw']->link('/index.php', $sub_entry_action_data ),
Modified: branches/Version-1_0-branch/property/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_config.inc.php
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/inc/hook_config.inc.php
2013-09-20 11:31:50 UTC (rev 11310)
@@ -197,7 +197,32 @@
return $out;
}
+
/**
+ * Get HTML listbox with request status that are to be set when request
is added to a project
+ *
+ * @param $config
+ * @return string HTML checkboxes to be placed in a table
+ */
+ function request_project_hookup_status($config)
+ {
+ $status_assigned =
isset($config['request_project_hookup_status']) ?
$config['request_project_hookup_status'] : '';
+ $status_entries =
execMethod('property.bogeneric.get_list',array('type' => 'request_status',
'selected' => $status_assigned));
+
+ $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ( $status_entries as $status)
+ {
+ $selected = $status['selected'] ? 'selected =
"selected"' : '';
+
+ $out .= <<<HTML
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+HTML;
+ }
+
+ return $out;
+ }
+
+ /**
* Get HTML listbox with workorder status that are to be set when
invoice is processed
*
* @param $config
Modified: branches/Version-1_0-branch/property/js/yahoo/project.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2013-09-20 11:31:50 UTC (rev 11310)
@@ -148,7 +148,7 @@
if(typeof(tableYUI0)=='undefined')
{
- tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
+ tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[1].parentNode;//
because:table 6 in front of 0
tableYUI0.setAttribute("id","tableYUI0");
}
else
@@ -184,7 +184,7 @@
if(typeof(tableYUI0)=='undefined')
{
- tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
+ tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[1].parentNode;//
because:table 6 in front of 0
tableYUI0.setAttribute("id","tableYUI0");
}
else
@@ -226,7 +226,7 @@
if(typeof(tableYUI1)=='undefined')
{
- tableYUI1 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[1].parentNode;
+ tableYUI1 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[2].parentNode;//
because:table 6 in front of 0
tableYUI1.setAttribute("id","tableYUI1");
}
else
@@ -263,7 +263,7 @@
if(typeof(tableYUI2)=='undefined')
{
- tableYUI2 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[2].parentNode;
+ tableYUI2 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[3].parentNode;//
because:table 6 in front of 0
tableYUI2.setAttribute("id","tableYUI2");
}
else
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2013-09-20
11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2013-09-20
11:31:50 UTC (rev 11310)
@@ -1386,6 +1386,9 @@
request a confirmation email when your email is opened by the recipient
property no Be om epost som kvittering når mottaker åpner eposten.
request %1 has been edited property no Behov %1 er oppdatert
request %1 has been saved property no Behov %1 er lagret
+request %1 has been deleted from project %2 property no Behov
%1 er koplet fra prosjekt %2
+request %1 has been added property no Behov %1 er lagt til
+request %1 has already been added to project %2 property no
Behov %1 er allerede koplet til prosjekt %2
request budget property no Budsjett for tiltak
request condition type property no Behov::konsekvenstype
request descr property no Beskrivelse av tiltak
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2013-09-20 11:31:50 UTC (rev 11310)
@@ -114,7 +114,16 @@
</td>
</tr>
+ <tr class="row_on">
+ <td>{lang_request_status_on_project_hookup}:</td>
+ <td>
+ <select
name="newsettings[request_project_hookup_status]">
+ {hook_request_project_hookup_status}
+ </select>
+ </td>
+ </tr>
+
<tr class="row_off">
<td>{lang_workorder_status_that_are_to_be_set_when_invoice_is_processed}:</td>
<td>
Modified: branches/Version-1_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/project.xsl
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/templates/base/project.xsl
2013-09-20 11:31:50 UTC (rev 11310)
@@ -111,13 +111,23 @@
<tr>
<td valign="top">
<a href="{link_select_request}"
title="{lang_select_request_statustext}">
-
<xsl:value-of select="lang_select_request"/>
+
<xsl:value-of select="php:function('lang',
'select request')"/>
</a>
</td>
</tr>
</xsl:when>
</xsl:choose>
-
<xsl:for-each select="value_origin">
+ <tr>
+
<td width="19%" align="left" valign="top">
+
<xsl:value-of select="php:function('lang', 'related')"/>
+
</td>
+
<td>
+
<div id="paging_6"> </div>
+
<div id="datatable-container_6"/>
+
</td>
+ </tr>
+
+ <!--
<xsl:for-each select="value_origin">
<xsl:variable name="origin_location">
<xsl:value-of select="location"/>
</xsl:variable>
@@ -150,6 +160,7 @@
</td>
</tr>
</xsl:for-each>
+ -->
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="value_origin">
@@ -779,6 +790,7 @@
<xsl:value-of select="php:function('lang', 'files')"/>
</td>
<td>
+
<div id="paging_5"> </div>
<div id="datatable-container_5"/>
</td>
</tr>
Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl
2013-09-20 11:28:27 UTC (rev 11309)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl
2013-09-20 11:31:50 UTC (rev 11310)
@@ -218,19 +218,31 @@
<xsl:value-of select="id"/>
</a>
<xsl:text> </xsl:text>
-
<xsl:choose>
-
<xsl:when test="location
='.project.request'">
-
<input type="checkbox"
name="values[delete_request][]" value="{id}">
-
<xsl:attribute
name="title">
-
<xsl:value-of
select="//lang_delete_request_statustext"/>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
</xsl:choose>
</td>
</xsl:for-each>
</table>
</xsl:for-each>
+
<xsl:choose>
+
<xsl:when test="value_target!=''">
+
<br/>
+
</xsl:when>
+
</xsl:choose>
+
<xsl:for-each select="value_target">
+
<label>
+
<xsl:value-of select="descr"/>
+
</label>
+
<table name="msg_table">
+
<xsl:for-each select="data">
+
<td class="th_text" align="left">
+
<a href="{link}" title="{statustext}">
+
<xsl:value-of select="id"/>
+
</a>
+
<xsl:text> </xsl:text>
+
</td>
+
</xsl:for-each>
+
</table>
+
</xsl:for-each>
+
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="value_origin">
@@ -324,21 +336,6 @@
<dl class="proplist-col">
<input type="hidden" name="values[origin]"
value="{value_origin_type}"/>
<input type="hidden" name="values[origin_id]"
value="{value_origin_id}"/>
-
<xsl:for-each select="value_target">
-
<dt>
-
<label>
-
<xsl:value-of select="descr"/>
-
</label>
-
</dt>
-
<dd>
-
<xsl:for-each select="data">
-
<a href="{link}"
title="{statustext}">
-
<xsl:value-of
select="id"/>
-
</a>
-
<xsl:text> </xsl:text>
-
</xsl:for-each>
-
</dd>
-
</xsl:for-each>
<xsl:choose>
<xsl:when test="mode ='edit'">
<xsl:call-template
name="location_form2"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11310] Merge 11308:11309 from trunk,
Sigurd Nes <=