[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11324] Merge 11317:11323 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11324] Merge 11317:11323 from trunk |
|
Date: |
Wed, 25 Sep 2013 16:23:29 +0000 |
Revision: 11324
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11324
Author: sigurdne
Date: 2013-09-25 16:23:28 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Merge 11317:11323 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
branches/Version-1_0-branch/catch/setup/default_records.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/hook_settings.inc.php
branches/Version-1_0-branch/property/setup/default_records.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/tts.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,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,11311,11313-11316
+
/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,11311,11313-11316,11318-11323
Modified: branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/admin/inc/hook_after_navbar.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -58,7 +58,7 @@
$_current[$app_name] = True;
if($app_name == 'phpgwapi')
{
- $api_str = lang('The
API is current');
+ $api_str = lang('The
API is current') . '::OK';
}
}
else
Modified: branches/Version-1_0-branch/catch/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/setup/default_records.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/catch/setup/default_records.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -68,12 +68,13 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id,
name, descr, allow_grant) VALUES ({$app_id}, '.catch.2', 'Shema category', 1)");
//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations (app_id,
name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.catch.2.1', 'Shema type 1', 1, 1, 'fm_catch_2_1')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (id, name, descr)
VALUES (1, 'Users and devices', 'Users and devices')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (id, name, descr)
VALUES (2, 'Shema type 1', 'Shema type 1')");
+$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (location_id, id,
name, descr) VALUES ({$location_id}, 1, 'Users and devices', 'Users and
devices')");
+$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch (location_id, id,
name, descr) VALUES ({$location_id}, 2, 'Shema type 1', 'Shema type 1')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch_category
(entity_id, id, name, descr) VALUES (1, 1, 'Users and devices', 'Users and
devices')");
-//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch_category
(entity_id, id, name, descr, fileupload) VALUES (2, 1, 'Shema type 1', 'Shema
type 1', 1)");
+$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.1.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_catch_category
(location_id, entity_id, id, name, descr) VALUES ({$location_id}, 1, 1, 'Users
and devices', 'Users and devices')");
-$location_id = $GLOBALS['phpgw']->locations->get_id('catch', '.catch.1.1');
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 1, 'unitid', 'UnitID', 'UnitID for device', 'V', 1, 1, NULL, 50,
NULL, NULL, 'False')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 2, 'user_', 'User', 'System user', 'user', 1, 2, NULL, NULL,
NULL, NULL, 'False')");
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -478,16 +478,15 @@
$this->tmpl->set_var('lang_new_user', lang('new user'));
$this->tmpl->set_var('lang_forgotten_password',
lang('forgotten password'));
- $url_new_user =
"{$webserver_url}/registration/main.php?logindomain={$_COOKIE['last_domain']}";
+ $url_new_user =
"{$webserver_url}/registration/main.php";
$this->tmpl->set_var('url_new_user', $url_new_user);
- $url_forgotten_password =
"{$webserver_url}/registration/main.php?" . http_build_query(array(
- 'menuaction'
=>'registration.uireg.lostpw1',
- 'logindomain'
=>$_COOKIE['last_domain'])
+ $url_lost_password =
"{$webserver_url}/registration/main.php?" . http_build_query(array(
+ 'menuaction'
=>'registration.uireg.lostpw1')
);
- $this->tmpl->set_var('url_forgotten_password',
$url_forgotten_password);
+ $this->tmpl->set_var('url_lost_password',
$url_lost_password);
$this->tmpl->set_var('website_title',
isset($GLOBALS['phpgw_info']['server']['site_title'])
?
$GLOBALS['phpgw_info']['server']['site_title']
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2013-09-25 16:23:28 UTC (rev 11324)
@@ -36,6 +36,25 @@
}
document.login.submit();
}
+
+
+ function new_user()
+ {
+ var url_new_user = '{url_new_user}';
+
+ url_new_user += '?logindomain=' +
document.getElementById("logindomain").value;
+ window.open(url_new_user,'_blank');
+ }
+
+ function lost_password()
+ {
+ var url_lost_password = '{url_lost_password}';
+
+ url_lost_password += '&logindomain=' +
document.getElementById("logindomain").value;
+ window.open(url_lost_password,'_blank');
+ }
+
+
</script>
</head>
@@ -97,7 +116,7 @@
</p>
<!-- END
loging_block -->
<!-- BEGIN
domain_from_host -->
-
@{logindomain}<input type="hidden" name="logindomain" value="{logindomain}">
+
@{logindomain}<input type="hidden" id="logindomain" name="logindomain"
value="{logindomain}">
<!-- END
domain_from_host -->
<br>
<!-- BEGIN
login_additional_info -->
@@ -164,10 +183,10 @@
<p>{instruction}</p>
<p >
- <a href="{url_new_user}"
target="_blank">{lang_new_user}</a>
+ <a
href="javascript:new_user();">{lang_new_user}</a>
</p>
</p>
- <a
href="{url_forgotten_password}" target="_blank">{lang_forgotten_password}</a>.
+ <a
href="javascript:lost_password();">{lang_forgotten_password}</a>.
</p>
<div id="lock"></div>
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -129,6 +129,7 @@
$valid_type = false;
switch ($file['type'])
{
+ case
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
case 'application/vnd.ms-excel':
$this->csvdata =
$this->getexceldata($file['name']);
$valid_type = true;
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -2727,7 +2727,8 @@
}
unset($_temp);
- if($vendor_email)
+ $preview_html = phpgw::get_var('preview_html', 'bool');
+ if($vendor_email || $preview_html)
{
$subject = lang('workorder').":
{$ticket['order_id']}";
@@ -2741,14 +2742,18 @@
$organisation =
$this->bo->config->config_data['org_name'];
}
- if(isset($values['on_behalf_of_assigned']) &&
$values['on_behalf_of_assigned'] && isset($ticket['assignedto_name']))
+ $on_behalf_of_assigned =
phpgw::get_var('on_behalf_of_assigned', 'bool');
+ if($on_behalf_of_assigned &&
isset($ticket['assignedto_name']))
{
$user_name = $ticket['assignedto_name'];
$GLOBALS['phpgw']->preferences->set_account_id($ticket['assignedto'], true);
$GLOBALS['phpgw_info']['user']['preferences'] =
$GLOBALS['phpgw']->preferences->data;
- $_behalf_alert = lang('this order is
sent by %1 on behalf of %2',$GLOBALS['phpgw_info']['user']['fullname'],
$user_name);
-
$historylog->add('C',$id,$_behalf_alert);
- unset($_behalf_alert);
+ if(!$preview_html)
+ {
+ $_behalf_alert = lang('this
order is sent by %1 on behalf of
%2',$GLOBALS['phpgw_info']['user']['fullname'], $user_name);
+
$historylog->add('C',$id,$_behalf_alert);
+ unset($_behalf_alert);
+ }
}
else
{
@@ -2789,6 +2794,7 @@
$body = nl2br(str_replace(array
(
+ '__vendor_name__',
'__organisation__',
'__user_name__',
'__user_phone__',
@@ -2804,6 +2810,7 @@
'[/b]'
),array
(
+
$vendor_data['value_vendor_name'],
$organisation,
$user_name,
$user_phone,
@@ -2819,6 +2826,20 @@
'</b>'
),$order_email_template));
+ $html =
"<html><head><title>{$subject}</title></head>";
+ $html .= "<body>{$body}</body></html>";
+
+
+ if($preview_html)
+ {
+
+
$GLOBALS['phpgw_info']['flags']['noheader'] = true;
+
$GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
$GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+ echo $html;
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
if(isset($values['file_attach']) &&
is_array($values['file_attach']))
{
$bofiles =
CreateObject('property.bofiles');
@@ -3244,6 +3265,8 @@
'building_part_list'
=> array('options' => $this->bocommon->select_category_list(array('type'=>
'building_part','selected' =>$ticket['building_part'], 'order' => 'id',
'id_in_name' => 'num', 'filter' => $_filter_buildingpart))),
'order_dim1_list'
=> array('options' =>
$this->bocommon->select_category_list(array('type'=> 'order_dim1','selected'
=>$ticket['order_dim1'], 'order' => 'id', 'id_in_name' => 'num' ))),
'branch_list'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list']==1
? array('options' => execMethod('property.boproject.select_branch_list',
$values['branch_id'])) :'',
+ 'preview_html'
=> "javascript:preview_html($id)",
+
);
//---datatable settings--------------------
Modified: branches/Version-1_0-branch/property/inc/hook_settings.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -309,7 +309,9 @@
create_select_box('remove navbar','nonavbar',array('no' => 'No','yes'
=> 'Yes'),'Navigation bar is removed');
create_select_box('Tabel export format','export_format',array('excel'
=> 'Excel','csv' => 'CSV', 'ods' => 'ODS'),'Choose which format to export from
the system for tables');
- $default = 'Fra: __organisation__';
+ $default = 'Til: __vendor_name__';
+ $default .= "\n";
+ $default .= "\n" . 'Fra: __organisation__';
$default .= "\n" . 'Saksbehandler: __user_name__, ressursnr:
__ressursnr__';
$default .= "\n";
$default .= "\n" . '__location__';
Modified: branches/Version-1_0-branch/property/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/default_records.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/property/setup/default_records.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -398,25 +398,28 @@
# Dumping data for table fm_entity
#
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, descr,
location_form, documentation) VALUES (1, 'Equipment', 'equipment', 1, 1)");
+$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (location_id, id,
name, descr, location_form, documentation) VALUES ({$location_id}, 1,
'Equipment', 'equipment', 1, 1)");
//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name,
descr, location_form, documentation, lookup_entity) VALUES (2, 'Report',
'report', 1, NULL, 'a:1:{i:0;s:1:"1";}')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, descr,
location_form, documentation, lookup_entity) VALUES (2, 'Report', 'report', 1,
NULL, '')");
+$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (location_id, id,
name, descr, location_form, documentation, lookup_entity) VALUES
({$location_id}, 2, 'Report', 'report', 1, NULL, '')");
#
# Dumping data for table fm_entity_category
#
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level)
VALUES (1, 1, 'Meter', 'Meter', NULL, NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level)
VALUES (1, 2, 'Elevator', 'Elevator', 'E', NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level)
VALUES (1, 3, 'Fire alarm central', 'Fire alarm central', 'F', NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level)
VALUES (2, 1, 'Report type 1', 'Report type 1', 'RA', 1, 1, 4)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level)
VALUES (2, 2, 'Report type 2', 'Report type 2', 'RB', 1, 1, 4)");
+
+
+
+
#
# Dumping data for table fm_entity_attribute
#
$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking,
location_level) VALUES ({$location_id}, 1, 1, 'Meter', 'Meter', NULL, NULL,
NULL, 3)");
+
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL,
NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 2, 'category', 'Category', 'Category statustext', 'LB', NULL, 2,
NULL, NULL, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 3, 'ext_system_id', 'Ext system id', 'External system id', 'V',
NULL, 3, NULL, 12, NULL, NULL, 'False')");
@@ -428,6 +431,7 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice
(location_id, attrib_id, id, value) VALUES ($location_id, 2, 2, 'Joint power
meter')");
$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking,
location_level) VALUES ({$location_id}, 1, 2, 'Elevator', 'Elevator', 'E',
NULL, NULL, 3)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL,
NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V',
NULL, 2, NULL, 12, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D',
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
@@ -442,6 +446,7 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice
(location_id, attrib_id, id, value) VALUES ($location_id, 5, 2, 'choice 2')");
$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.1.3');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking,
location_level) VALUES ({$location_id}, 1, 3, 'Fire alarm central', 'Fire alarm
central', 'F', NULL, NULL, 3)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL,
NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V',
NULL, 2, NULL, 12, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D',
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
@@ -456,6 +461,7 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice
(location_id, attrib_id, id, value) VALUES ($location_id, 5, 2, 'choice 2')");
$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.2.1');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking,
location_level) VALUES ({$location_id}, 2, 1, 'Report type 1', 'Report type 1',
'RA', 1, 1, 4)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL,
NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V',
NULL, 2, NULL, 12, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D',
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
@@ -470,6 +476,7 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_choice
(location_id, attrib_id, id, value) VALUES ($location_id, 5, 2, 'choice 2')");
$location_id = $GLOBALS['phpgw']->locations->get_id('property', '.entity.2.2');
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category
(location_id, entity_id, id, name, descr, prefix, lookup_tenant, tracking,
location_level) VALUES ({$location_id}, 2, 2, 'Report type 2', 'Report type 2',
'RB', 1, 1, 4)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 1, 'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL,
NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 2, 'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V',
NULL, 2, NULL, 12, NULL, NULL, 'True')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_cust_attribute
(location_id, id, column_name, input_text, statustext, datatype, list,
attrib_sort, size, precision_, scale, default_value, nullable) VALUES
($location_id, 3, 'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D',
NULL, 3, NULL, NULL, NULL, NULL, 'True')");
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2013-09-25 14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2013-09-25 16:23:28 UTC (rev 11324)
@@ -7637,6 +7637,22 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
$GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM
fm_entity_category");
+
+ $categories = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ if($prefix =
$GLOBALS['phpgw_setup']->oProc->f('prefix'))
+ {
+ $categories[] = array
+ (
+ 'prefix' => $prefix,
+ 'entity_id' =>
$GLOBALS['phpgw_setup']->oProc->f('entity_id'),
+ 'cat_id' =>
$GLOBALS['phpgw_setup']->oProc->f('id')
+ );
+ }
+ }
$tables = $GLOBALS['phpgw_setup']->oProc->m_odb->table_names();
@@ -7646,8 +7662,50 @@
{
$metadata =
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata($table);
+ $primary_keys = array();
+ foreach($metadata as $key => $info)
+ {
+ if(isset($info->primary_key) &&
$info->primary_key)
+ {
+ $primary_keys[] = $key;
+ }
+ }
+
if(isset($metadata['p_num']))
{
+
+ foreach ($categories as $category)
+ {
+
+ $cols =
array_merge($primary_keys, array('p_num'));
+ $records = array();
+ $i = 0;
+
$GLOBALS['phpgw_setup']->oProc->query("SELECT " . implode(',', $cols) . " FROM
{$table} WHERE p_entity_id = '{$category[entity_id]}' AND p_cat_id =
'{$category[cat_id]}'");
+
+ while
($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ foreach ($cols as $col)
+ {
+
$records[$i][$col] = $GLOBALS['phpgw_setup']->oProc->f($col);
+ }
+ $i++;
+ }
+
+ foreach ($records as $record)
+ {
+ $p_num = (int)
ltrim($record['p_num'], $category['prefix']);
+ $condition_arr =
array();
+ foreach ($primary_keys
as $primary_key)
+ {
+
$condition_arr[] = "{$primary_key} = '{$record[$primary_key]}'";
+ }
+
+ $sql = "UPDATE {$table}
SET p_num = '{$p_num}' WHERE ". implode(' AND ', $condition_arr);
+
+
$GLOBALS['phpgw_setup']->oProc->query($sql);
+ }
+ }
+
$sql = "UPDATE {$table} SET p_num =
p_num::integer WHERE p_num IS NOT NULL";
$GLOBALS['phpgw_setup']->oProc->query($sql);
}
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2013-09-25
14:57:45 UTC (rev 11323)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2013-09-25
16:23:28 UTC (rev 11324)
@@ -395,6 +395,17 @@
var strURL = phpGWLink('index.php', oArgs);
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
}
+
+ function preview_html(id)
+ {
+
+ var on_behalf_of_assigned =
document.getElementById("on_behalf_of_assigned").checked ? 1 : 0;
+
+ var oArgs =
{menuaction:'property.uitts.view',id:id, preview_html:true,
on_behalf_of_assigned: on_behalf_of_assigned};
+ var strURL = phpGWLink('index.php', oArgs);
+
Window1=window.open(strURL,'Search',"left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+
+ }
</script>
<table cellpadding="2" cellspacing="2" width="95%"
align="center">
<xsl:choose>
@@ -808,7 +819,17 @@
</td>
<td>
<xsl:value-of select="value_order_id"/>
+
<xsl:text> </xsl:text>
<input type="hidden" name="values[order_id]"
value="{value_order_id}"/>
+
<xsl:variable name="lang_preview_html">
+
<xsl:value-of select="php:function('lang',
'preview html')"/>
+
</xsl:variable>
+
<a href="{preview_html}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_preview_html"/>
+
</xsl:attribute>
+
<xsl:value-of select="$lang_preview_html"/>
+
</a>
</td>
</tr>
<tr>
@@ -818,13 +839,14 @@
</label>
</td>
<td>
-
<input type="checkbox"
name="values[on_behalf_of_assigned]" value="True">
+
<input type="checkbox" id = "on_behalf_of_assigned"
name="on_behalf_of_assigned" value="True">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'on behalf of assigned - vacation mode')"/>
</xsl:attribute>
</input>
</td>
</tr>
+
<xsl:call-template name="vendor_form"/>
<xsl:call-template name="ecodimb_form"/>
<xsl:call-template name="b_account_form"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11324] Merge 11317:11323 from trunk,
Sigurd Nes <=