[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12037] Merge 12031:12036 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [12037] Merge 12031:12036 from trunk |
Date: |
Mon, 30 Jun 2014 07:53:00 +0000 |
Revision: 12037
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12037
Author: sigurdne
Date: 2014-06-30 07:52:58 +0000 (Mon, 30 Jun 2014)
Log Message:
-----------
Merge 12031:12036 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
branches/Version-1_0-branch/admin/templates/base/custom.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/custom/default/catch_ticket_export.php
branches/Version-1_0-branch/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
Added Paths:
-----------
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_pre_commit_validate.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,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030
+
/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,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036
Modified: branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -480,6 +480,7 @@
'sorting'
=> $entry['sorting'],
'active'
=> $entry['active']?'X':'',
'client_side'
=> $entry['client_side']?'X':'',
+ 'pre_commit'
=> $entry['pre_commit']?'X':'',
'link_up'
=> $GLOBALS['phpgw']->link('/index.php',array
(
'menuaction' =>
'admin.ui_custom.list_custom_function',
@@ -533,6 +534,7 @@
(
'lang_descr' => lang('Descr'),
'lang_active' => lang('Active'),
+ 'lang_pre_commit' => lang('pre commit'),
'lang_client_side' => lang('client side'),
'lang_sorting' => lang('sorting'),
'lang_search' => lang('search'),
@@ -743,6 +745,7 @@
'value_active'
=> isset($values['active'])?$values['active']:'',
'value_client_side'
=> $values['client_side'],
+ 'value_pre_commit'
=> $values['pre_commit'],
'lang_active'
=> lang('Active'),
'lang_active_statustext'
=> lang('check to activate custom function'),
);
Modified: branches/Version-1_0-branch/admin/templates/base/custom.xsl
===================================================================
--- branches/Version-1_0-branch/admin/templates/base/custom.xsl 2014-06-30
07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/admin/templates/base/custom.xsl 2014-06-30
07:52:58 UTC (rev 12037)
@@ -544,6 +544,9 @@
<xsl:value-of select="lang_descr"/>
</td>
<td class="th_text" width="5%" align="center">
+ <xsl:value-of select="lang_pre_commit"/>
+ </td>
+ <td class="th_text" width="5%" align="center">
<xsl:value-of select="lang_client_side"/>
</td>
<td class="th_text" width="5%" align="center">
@@ -587,6 +590,9 @@
<xsl:value-of select="descr"/>
</td>
<td align = 'center'>
+ <xsl:value-of select="pre_commit"/>
+ </td>
+ <td align = 'center'>
<xsl:value-of select="client_side"/>
</td>
<td align = 'center'>
@@ -722,23 +728,40 @@
</xsl:choose>
</td>
</tr>
- <tr>
- <td>
- <xsl:value-of
select="php:function('lang', 'client-side')"/>
- </td>
- <td>
- <input type="checkbox"
name="values[client_side]" value="1">
- <xsl:attribute
name="title">
-
<xsl:text>otherwise: server-side</xsl:text>
- </xsl:attribute>
- <xsl:if
test="value_client_side = '1'">
-
<xsl:attribute name="checked">
-
<xsl:text>checked</xsl:text>
- </xsl:attribute>
- </xsl:if>
- </input>
- </td>
- </tr>
+ <tr>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'pre commit')"/>
+ </td>
+ <td>
+ <input type="checkbox"
name="values[pre_commit]" value="1">
+ <xsl:attribute name="title">
+ <xsl:text>otherwise:
post commit</xsl:text>
+ </xsl:attribute>
+ <xsl:if test="value_pre_commit
= '1'">
+ <xsl:attribute
name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xsl:value-of
select="php:function('lang', 'client-side')"/>
+ </td>
+ <td>
+ <input type="checkbox"
name="values[client_side]" value="1">
+ <xsl:attribute name="title">
+ <xsl:text>otherwise:
server-side</xsl:text>
+ </xsl:attribute>
+ <xsl:if test="value_client_side
= '1'">
+ <xsl:attribute
name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </td>
+ </tr>
<tr height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.custom_functions.inc.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -130,6 +130,7 @@
'file_name' =>
$this->_db->db_addslashes($custom_function['custom_function_file']),
'descr' =>
$this->_db->db_addslashes($custom_function['descr']),
'active' =>
!!$custom_function['active'],
+ 'pre_commit' =>
!!$custom_function['pre_commit'],
'client_side' =>
!!$custom_function['client_side'],
'custom_sort' => $custom_sort
);
@@ -218,6 +219,7 @@
'descr' =>
$this->_db->db_addslashes($custom_function['descr']),
'file_name' =>
$custom_function['custom_function_file'],
'active' =>
$custom_function['active'],
+ 'pre_commit' =>
$custom_function['pre_commit'],
'client_side' =>
$custom_function['client_side'],
);
unset($custom_function);
@@ -320,6 +322,7 @@
'sorting' =>
$this->_db->f('custom_sort'),
'descr' =>
$this->_db->f('descr'),
'active' =>
!!$this->_db->f('active'),
+ 'pre_commit' =>
!!$this->_db->f('pre_commit'),
'client_side' =>
!!$this->_db->f('client_side')
);
}
@@ -362,6 +365,7 @@
'descr' =>
$this->_db->f('descr', true),
'custom_function_file' =>
$this->_db->f('file_name'),
'active' =>
!!$this->_db->f('active'),
+ 'pre_commit' =>
!!$this->_db->f('pre_commit'),
'client_side' =>
!!$this->_db->f('client_side')
);
}
Modified: branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php 2014-06-30
07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/phpgwapi/setup/setup.inc.php 2014-06-30
07:52:58 UTC (rev 12037)
@@ -12,7 +12,7 @@
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.545';
+ $setup_info['phpgwapi']['version'] = '0.9.17.546';
$setup_info['phpgwapi']['versions']['current_header'] = '1.31';
$setup_info['phpgwapi']['versions']['system'] = '1.0';
$setup_info['phpgwapi']['enable'] = 3;
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -632,6 +632,7 @@
'descr' => array('type' => 'text','nullable' =>
true),
'file_name' => array('type' =>
'varchar','precision' => 255,'nullable' => false),
'active' => array('type' => 'int','precision'
=> 2,'nullable' => true),
+ 'pre_commit' => array('type' =>
'int','precision' => 2,'nullable' => true),//otherwise: post commit
'client_side' => array('type' =>
'int','precision' => 2,'nullable' => true),//otherwise: server-side
'custom_sort' => array('type' =>
'int','precision' => 4,'nullable' => true)
),
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -3232,3 +3232,26 @@
}
}
+ $test[] = '0.9.17.545';
+ /**
+ * Add option on pre/post commit on custom functions - when to include
function
+ *
+ * @return string the new version number
+ */
+ function phpgwapi_upgrade0_9_17_545()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ //otherwise: post commit
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cust_function','pre_commit',
array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.546';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
+ }
\ No newline at end of file
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -706,15 +706,6 @@
$values_attribute =
$this->custom->convert_attribute_save($values_attribute);
}
- if ($action=='edit')
- {
- $receipt =
$this->so->edit($values,$values_attribute,$entity_id,$cat_id);
- }
- else
- {
- $receipt =
$this->so->add($values,$values_attribute,$entity_id,$cat_id);
- }
-
$criteria = array
(
'appname' =>
$this->type_app[$this->type],
@@ -734,12 +725,39 @@
$file = PHPGW_SERVER_ROOT .
"/{$this->type_app[$this->type]}/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
- if ( $entry['active'] && !$entry['client_side']
&& is_file($file) )
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'] && $entry['pre_commit'])
{
require_once $file;
}
}
+
+ if ($action=='edit')
+ {
+ $receipt =
$this->so->edit($values,$values_attribute,$entity_id,$cat_id);
+ }
+ else
+ {
+ $receipt =
$this->so->add($values,$values_attribute,$entity_id,$cat_id);
+ }
+
+ reset($custom_functions);
+ foreach ( $custom_functions as $entry )
+ {
+ // prevent path traversal
+ if ( preg_match('/\.\./', $entry['file_name']) )
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/{$this->type_app[$this->type]}/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'] && !$entry['pre_commit'])
+ {
+ require_once $file;
+ }
+ }
+
return $receipt;
}
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -996,39 +996,27 @@
return (int)$result['id'];
}
- function add($ticket, $values_attribute = array())
+ function add($data, $values_attribute = array())
{
- if((!isset($ticket['location_code']) || !
$ticket['location_code']) && isset($ticket['location']) &&
is_array($ticket['location']))
+ if((!isset($data['location_code']) || !
$data['location_code']) && isset($data['location']) &&
is_array($data['location']))
{
- while (is_array($ticket['location']) &&
list(,$value) = each($ticket['location']))
+ while (is_array($data['location']) &&
list(,$value) = each($data['location']))
{
if($value)
{
$location[] = $value;
}
}
- $ticket['location_code']=implode("-",
$location);
+ $data['location_code']=implode("-", $location);
}
- $ticket['finnish_date'] =
$this->bocommon->date_to_timestamp($ticket['finnish_date']);
+ $data['finnish_date'] =
$this->bocommon->date_to_timestamp($data['finnish_date']);
if($values_attribute && is_array($values_attribute))
{
$values_attribute =
$this->custom->convert_attribute_save($values_attribute);
}
- $receipt = $this->so->add($ticket, $values_attribute);
-
- $this->config->read();
-
- if ( (isset($ticket['send_mail']) &&
$ticket['send_mail'])
- ||
(isset($this->config->config_data['mailnotification'])
- &&
$this->config->config_data['mailnotification'])
- )
- {
- $receipt_mail =
$this->mail_ticket($receipt['id'],false,$receipt,$ticket['location_code'],
false, isset($ticket['send_mail']) && $ticket['send_mail'] ? true : false);
- }
-
$criteria = array
(
'appname' => 'property',
@@ -1047,8 +1035,36 @@
}
$file = PHPGW_SERVER_ROOT .
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
- if ( $entry['active'] && is_file($file) )
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'] && $entry['pre_commit'])
{
+ require $file;
+ }
+ }
+
+ $receipt = $this->so->add($data, $values_attribute);
+
+ $this->config->read();
+
+ if ( (isset($data['send_mail']) && $data['send_mail'])
+ ||
(isset($this->config->config_data['mailnotification'])
+ &&
$this->config->config_data['mailnotification'])
+ )
+ {
+ $receipt_mail =
$this->mail_ticket($receipt['id'],false,$receipt,$data['location_code'], false,
isset($data['send_mail']) && $data['send_mail'] ? true : false);
+ }
+
+ reset($custom_functions);
+ foreach ( $custom_functions as $entry )
+ {
+ // prevent path traversal
+ if ( preg_match('/\.\./', $entry['file_name']) )
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'] && !$entry['pre_commit'])
+ {
require_once $file;
}
}
@@ -1407,16 +1423,13 @@
return $receipt;
}
- public function update_ticket($data, $id,$receipt =
array(),$values_attribute = array())
+ public function update_ticket(&$data, $id,$receipt =
array(),$values_attribute = array())
{
if($values_attribute && is_array($values_attribute))
{
$values_attribute =
$this->custom->convert_attribute_save($values_attribute);
}
- $receipt = $this->so->update_ticket($data, $id,
$receipt, $values_attribute, $this->simple);
- $this->fields_updated = $this->so->fields_updated;
-
$criteria = array
(
'appname' => 'property',
@@ -1435,12 +1448,33 @@
}
$file = PHPGW_SERVER_ROOT .
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
- if ( $entry['active'] && is_file($file) &&
!$entry['client_side'])
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'] && $entry['pre_commit'])
{
require $file;
}
}
+ $receipt = $this->so->update_ticket($data, $id,
$receipt, $values_attribute, $this->simple);
+ $this->fields_updated = $this->so->fields_updated;
+
+
+ reset($custom_functions);
+
+ foreach ( $custom_functions as $entry )
+ {
+ // prevent path traversal
+ if ( preg_match('/\.\./', $entry['file_name']) )
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ if ( $entry['active'] && is_file($file) &&
!$entry['client_side'] && !$entry['pre_commit'])
+ {
+ require $file;
+ }
+ }
+
return $receipt;
}
Modified:
branches/Version-1_0-branch/property/inc/custom/default/catch_ticket_export.php
===================================================================
---
branches/Version-1_0-branch/property/inc/custom/default/catch_ticket_export.php
2014-06-30 07:45:51 UTC (rev 12036)
+++
branches/Version-1_0-branch/property/inc/custom/default/catch_ticket_export.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -282,5 +282,5 @@
}
$export = new catch_ticket_export();
- $export->export_ticket($ticket);
+ $export->export_ticket($data);
Modified:
branches/Version-1_0-branch/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
===================================================================
---
branches/Version-1_0-branch/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
2014-06-30 07:45:51 UTC (rev 12036)
+++
branches/Version-1_0-branch/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -1,5 +1,5 @@
<?php
- if($ticket['cat_id'] == 4)
+ if($data['cat_id'] == 4)
{
$db = $this->bocommon->new_db();
Copied:
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php
(from rev 12036,
trunk/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php)
===================================================================
---
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php
(rev 0)
+++
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_pre_commit_validate.php
2014-06-30 07:52:58 UTC (rev 12037)
@@ -0,0 +1,36 @@
+<?php
+ /*
+ * This file will only work for the implementation of NLSH
+ */
+
+ /**
+ * Intended for custom validation of tickets prior to commit.
+ *
+ * @author Sigurd Nes <address@hidden>
+ */
+ class ticket_NLSH_pre_commit_validate extends property_botts
+ {
+ function __construct()
+ {
+ parent::__construct();
+ }
+
+ /**
+ * Do your magic
+ * @param integer $id
+ * @param array $data
+ * @param array $values_attribute
+ */
+ function validate($id = 0, &$data, $values_attribute = array())
+ {
+ // _debug_array($data);
+ // $data['assignedto'] = 11;
+ // return 'Validate';
+ }
+ }
+
+ $ticket_NLSH_pre_commit_validate = new
ticket_NLSH_pre_commit_validate();
+ if($_error = $ticket_NLSH_pre_commit_validate->validate($id, $data,
$values_attribute))
+ {
+ return $receipt['error'][]=array('msg'=>$_error);
+ }
Modified:
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
===================================================================
---
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
2014-06-30 07:45:51 UTC (rev 12036)
+++
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
2014-06-30 07:52:58 UTC (rev 12037)
@@ -1,13 +1,38 @@
+$(document).ready(function()
+{
+ show_feilkoder();
+
+ $("#global_category_id").change(function()
+ {
+ show_feilkoder();
+ });
+
+});
+
+function show_feilkoder()
+{
+ if ($("#global_category_id").val() == 20)
+ {
+ document.getElementById('label_feilkoder').style.display =
'block';
+ document.getElementById('id_feilkoder').style.display = 'block';
+ }
+ else
+ {
+ document.getElementById('label_feilkoder').style.display =
'none';
+ document.getElementById('id_feilkoder').style.display = 'none';
+ }
+
+}
function validate_submit()
{
var error = false;
var feilkode_id = $("#id_feilkoder").val();
var category_id = $("#global_category_id").val();
var group_id = $("#global_category_id").val();
- var status_id = $("#status_id").val();
+ var status_id = $("#status_id").val();
- if(category_id == 20)
+ if (category_id == 20)
{
if (!feilkode_id && status_id == 'X')
{
@@ -15,7 +40,7 @@
}
}
- if(error)
+ if (error)
{
alert('Feilkode må velges før meldingen kan avsluttes');
}
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2014-06-30 07:45:51 UTC (rev 12036)
+++ branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2014-06-30 07:52:58 UTC (rev 12037)
@@ -39,6 +39,7 @@
<xsl:choose>
<xsl:when test="not(hide_row)">
<td class="first"
title="{$statustext}">
+ <div id="label_{name}">
<label>
<xsl:choose>
<xsl:when
test="helpmsg=1">
@@ -71,6 +72,7 @@
</xsl:when>
</xsl:choose>
</label>
+ </div>
</td>
</xsl:when>
</xsl:choose>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12037] Merge 12031:12036 from trunk,
Sigurd Nes <=