[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12007] Merge 12003:12006 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12007] Merge 12003:12006 from trunk |
|
Date: |
Thu, 05 Jun 2014 08:44:59 +0000 |
Revision: 12007
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12007
Author: sigurdne
Date: 2014-06-05 08:44:58 +0000 (Thu, 05 Jun 2014)
Log Message:
-----------
Merge 12003:12006 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/js/yui3/datatable.js
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/js/yahoo/tts.view.js
branches/Version-1_0-branch/property/templates/base/group_select.xsl
branches/Version-1_0-branch/property/templates/base/tts.xsl
Added Paths:
-----------
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,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
+
/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
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-05 08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2014-06-05 08:44:58 UTC (rev 12007)
@@ -479,6 +479,7 @@
'descr'
=> $entry['descr'],
'sorting'
=> $entry['sorting'],
'active'
=> $entry['active']?'X':'',
+ 'client_side'
=> $entry['client_side']?'X':'',
'link_up'
=> $GLOBALS['phpgw']->link('/index.php',array
(
'menuaction' =>
'admin.ui_custom.list_custom_function',
@@ -532,6 +533,7 @@
(
'lang_descr' => lang('Descr'),
'lang_active' => lang('Active'),
+ 'lang_client_side' => lang('client side'),
'lang_sorting' => lang('sorting'),
'lang_search' => lang('search'),
'lang_edit' => lang('edit'),
@@ -740,6 +742,7 @@
'custom_function_list'
=>
$this->bo->select_custom_function(isset($values['custom_function_file'])?$values['custom_function_file']:'',$appname),
'value_active'
=> isset($values['active'])?$values['active']:'',
+ 'value_client_side'
=> $values['client_side'],
'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-05
08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/admin/templates/base/custom.xsl 2014-06-05
08:44:58 UTC (rev 12007)
@@ -544,6 +544,9 @@
<xsl:value-of select="lang_descr"/>
</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">
<xsl:value-of select="lang_active"/>
</td>
<td class="th_text" width="10%" align="center">
@@ -584,6 +587,9 @@
<xsl:value-of select="descr"/>
</td>
<td align = 'center'>
+ <xsl:value-of select="client_side"/>
+ </td>
+ <td align = 'center'>
<xsl:value-of select="active"/>
</td>
<td>
@@ -618,7 +624,7 @@
<!-- add custom_function / edit custom_function -->
- <xsl:template match="edit_custom_function">
+ <xsl:template match="edit_custom_function"
xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -716,6 +722,23 @@
</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 height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
Modified: branches/Version-1_0-branch/phpgwapi/js/yui3/datatable.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yui3/datatable.js 2014-06-05
08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/phpgwapi/js/yui3/datatable.js 2014-06-05
08:44:58 UTC (rev 12007)
@@ -1,11 +1,9 @@
YAHOO.portico.setupToolbar = function() {
YAHOO.portico.renderUiFormItems('toolbar');
};
-
YAHOO.portico.setupListActions = function() {
YAHOO.portico.renderUiFormItems('list_actions');
};
-
YAHOO.portico.renderUiFormItems = function(container) {
var items = YAHOO.util.Dom.getElementsBy(function() {
return true;
@@ -22,7 +20,6 @@
}
}
};
-
YAHOO.portico.setupPaginator = function() {
var paginatorConfig = {
rowsPerPage: 10,
@@ -31,15 +28,12 @@
pageReportTemplate: "Showing items {startRecord} - {endRecord}
of {totalRecords}",
containers: ['paginator']
};
-
YAHOO.portico.lang('setupPaginator', paginatorConfig);
var pag = new YAHOO.widget.Paginator(paginatorConfig);
pag.render();
return pag;
};
-
YAHOO.portico.preSerializeQueryFormListeners = new Array();
-
YAHOO.portico.addPreSerializeQueryFormListener = function(func) {
YAHOO.portico.preSerializeQueryFormListeners.push(func);
}
@@ -57,11 +51,9 @@
{
var state = YAHOO.util.History.getCurrentState('state');
uri = parseUri(YAHOO.portico.dataSourceUrl);
-
var oArgs = uri.queryKey;
oArgs.phpgw_return_as = '';
oArgs.click_history = '';
-
donwload_func = oArgs.menuaction;
// modify actual function for "download" in path_values
// for example: property.uilocation.index -->
property.uilocation.download
@@ -71,17 +63,13 @@
oArgs.menuaction = donwload_func;
oArgs.allrows = 1;
oArgs.start = 0;
-
-
if (typeof (config_values) != 'undefined' &&
config_values.particular_download != 'undefined' &&
config_values.particular_download)
{
oArgs.menuaction = config_values.particular_download;
}
var requestUrl = phpGWLink('index.php', oArgs);
-
requestUrl += '&' + state;
-
window.open(requestUrl, 'window');
}
@@ -134,54 +122,158 @@
});
*/
+//
+// var paginator = new Y.PaginatorView({
+// model: new Y.PaginatorModel({
+// page: 3,
+// itemsPerPage: 20,
+// serverPaginationMap: {
+// totalItems: 'ResultSet.totalResultsAvailable',
+// // page: {toServer:
'requestedPage', fromServer: 'returnedPageNo'},
+// itemIndexStart: 'ResultSet.startIndex',
+// itemsPerPage: 'ResultSet.pageSize'
+// }
+// }),
+// container: '#paginator',
+// });
+// var configuration,
+// datatable, data,
+// urifordata = baseUrl,
+// dataTableContainer = Y.one("#datatable-container"),
+// configuration = {
+// method: 'POST',
+// headers: {
+// 'Content-Type': 'application/json',
+// },
+// on: {
+// success: function(transactionid, response,
arguments) {
+// data =
JSON.parse(response.responseText);
+// datatable = new Y.DataTable({
+//// paginatorView:
"MyPaginatorView",
+// columns:
YAHOO.portico.columnDefs,
+// sortBy: [{loc1: 'asc'},
{loc1_name: -1}],
+// data: data.ResultSet.Result,
+// paginator: paginator,
+// paginatorResize: true,
+// paginationSource: 'server', //
server-side pagination
+// }).render("#datatable-container");
+// },
+// failure: function(transactionid, response,
arguments) {
+// alert("Failure In Data Loading.");
+// }
+// }
+// };
+// Y.io(urifordata, configuration);
+});
- var paginator = new Y.PaginatorView({
- model: new Y.PaginatorModel({
- page: 3,
- itemsPerPage: 20,
- serverPaginationMap: {
- totalItems: 'ResultSet.totalResultsAvailable',
- // page: {toServer: 'requestedPage', fromServer:
'returnedPageNo'},
- itemIndexStart: 'ResultSet.startIndex',
- itemsPerPage: 'ResultSet.pageSize'
- }
- }),
- container: '#paginator',
- });
+YUI().use('io-form', 'json-parse', 'overlay', 'panel', 'escape', 'datatable',
'datasource-io', 'datasource-jsonschema', 'datatable-datasource',
'datatype-number', 'datatable-paginator', function(Y)
+{
+ var fields = [];
+ for (var i = 0; i < YAHOO.portico.columnDefs.length; i++) {
+ fields.push({key: YAHOO.portico.columnDefs[i].key,locator:
YAHOO.portico.columnDefs[i].key + '.' + YAHOO.portico.columnDefs[i].label});
+ }
+console.log(fields);
+ var baseUrl = YAHOO.portico.dataSourceUrl;
+ if (baseUrl[baseUrl.length - 1] != '&') {
+ baseUrl += '&';
+ }
- var configuration,
- datatable, data,
- urifordata = baseUrl,
- dataTableContainer = Y.one("#datatable-container"),
- configuration = {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
+ if (YAHOO.portico.initialSortedBy) {
+// baseUrl += 'sort=' + YAHOO.portico.initialSortedBy.key + '&dir=' +
YAHOO.portico.initialSortedBy.dir;
+ } else {
+// baseUrl += 'sort=' + fields[0];
+ }
+
+//create datasource
+ var dataLoaded = false;
+ var dataSource = new Y.DataSource.IO();
+ dataSource.plug(Y.Plugin.DataSourceJSONSchema, {
+ schema: {
+ metaFields: {
+ result: "ResultSet.recordsReturned",
+ totalItems: "ResultSet.totalResultsAvailable",
+ start_index: "ResultSet.startIndex",
+ page: "ResultSet.page",
+ page_size: "ResultSet.pageSize"
},
- on: {
- success: function(transactionid, response,
arguments) {
- data =
JSON.parse(response.responseText);
- datatable = new Y.DataTable({
-// paginatorView:
"MyPaginatorView",
- columns:
YAHOO.portico.columnDefs,
- sortBy: [{loc1: 'asc'},
{loc1_name: -1}],
- data: data.ResultSet.Result,
- paginator: paginator,
- paginatorResize: true,
- paginationSource: 'server', //
server-side pagination
- }).render("#datatable-container");
+ resultListLocator: "ResultSet.Result",
+ resultFields: fields
+ }
+ });
- },
- failure: function(transactionid, response,
arguments) {
- alert("Failure In Data Loading.");
- }
- }
- };
+ var columns = [];
+ for (var i = 0; i < YAHOO.portico.columnDefs.length; i++) {
+ columns.push(YAHOO.portico.columnDefs[i].key);
+ }
+//console.log(YAHOO.portico.columnDefs);
+//create datatable
+ var myDataTable = new Y.DataTable({
+ width: "100%",
+ columns: columns,
+ rowsPerPage: 10,
+ paginatorLocation: ['header', 'footer']
+ });
- Y.io(urifordata, configuration);
-});
+ myDataTable.plug(Y.Plugin.DataTableDataSource, {datasource:
dataSource});
+ myDataTable.render("#datatable-container");
+ //add listener for when the user uses the paginator
+ myDataTable.get('paginatorModel').on("change", handlePaginatorChange);
+// send initial request to load the data into the datatable
+ reloadTableData(1, 10);
+ /**function to call the server to obtain and render retrieved table
records*/
+ function reloadTableData(page, recordsPerPage)
+ {
+ var url = baseUrl;
+//make a request to the server to get record data
+ Y.io(url + '&page=' + page + '&records_per_page=' +
recordsPerPage,
+ {
+ method: 'GET',
+ on:
+ {
+//handle server repsonse
+ success: function(id, o, args) {
+ try {
+//parse JSON server data
+ // var response =
Y.JSON.parse(o.responseText);
+ var response =
JSON.parse(o.responseText);
+ if
(response.ResultSet.recordsReturned > 0)
+ {
+//console.log(response.ResultSet);
+
+ //load
new record data into data table
+
myDataTable.set("data", response.ResultSet.Result);
+// update the paginator attributes based on return server meta page data
+
myDataTable.get('paginatorModel').set('totalItems',
response.ResultSet.totalRecords);
+
myDataTable.get('paginatorModel').set('page', 1);//response.ResultSet.page);
+
myDataTable.get('paginatorModel').set('itemsPerPage',
response.ResultSet.pageSize);
+ }
+ }
+ catch (e)
+ {
+ }
+//set flag to allow the paginater to be used by the user again
+ dataLoaded = true;
+ },
+ failure: function(id, o, args) {
+ dataLoaded = true;
+ }
+ }
+ }
+ );
+ }
+
+ /** event listener for when the user interacts with the data table
paginator*/
+ function handlePaginatorChange(e)
+ {
+ if (dataLoaded) {
+ dataLoaded = false;
+ reloadTableData(this.get('page'),
this.get('itemsPerPage'));
+ }
+ return true;
+ }
+});
\ No newline at end of file
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-05 08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-06-05 08:44:58 UTC (rev 12007)
@@ -1429,7 +1429,7 @@
}
$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'])
{
require $file;
}
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2014-06-05
08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2014-06-05
08:44:58 UTC (rev 12007)
@@ -176,7 +176,12 @@
(
'text' => lang('ticket
Attributes'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.ui_custom.list_attribute', 'appname' => 'property', 'location' =>
'.ticket', 'menu_selection' => 'admin::property::ticket::ticket_attribs') )
- )
+ ),
+ 'ticket_functions' => array
+ (
+ 'text' => lang('custom
functions'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.ui_custom.list_custom_function','appname' => 'property', 'location' =>
'.ticket', 'menu_selection' => 'admin::property::ticket::ticket_functions') )
+ ),
);
$admin_children_owner = array
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-06-05 08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-06-05 08:44:58 UTC (rev 12007)
@@ -2086,6 +2086,7 @@
$function_msg =
lang('add ticket');
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'tts.add', 'property' );
+ $this->_insert_custom_js();
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->add_file(array('tts','files','attributes_form'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add'
=> $data));
@@ -2239,6 +2240,8 @@
$appname =
lang('helpdesk');
$function_msg = lang('add
ticket');
+ //$this->_insert_custom_js();
+
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add2' => $data));
// $GLOBALS['phpgw']->xslttpl->pp();
@@ -3420,6 +3423,7 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'tts.view', 'property' );
+ $this->_insert_custom_js();
//-----------------------datatable settings---
//_debug_array($data);die();
@@ -3979,4 +3983,48 @@
}
}
+ /**
+ *
+ */
+ private function _insert_custom_js()
+ {
+ $criteria = array
+ (
+ 'appname' => 'property',
+ 'location' => $this->acl_location,
+ 'allrows' => true
+ );
+
+ if(! $custom_functions =
$GLOBALS['phpgw']->custom_functions->find($criteria))
+ {
+ return false;
+ }
+
+ $js_found = false;
+
+ 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'] && $entry['client_side']
&& is_file($file))
+ {
+
$GLOBALS['phpgw']->js->add_external_file("/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}");
+ $js_found = true;
+ }
+ }
+
+ if($js_found)
+ {
+ phpgw::import_class('phpgwapi.jquery');
+ phpgwapi_jquery::load_widget('core');
+ }
+
+ }
+
}
Copied:
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
(from rev 12006, trunk/property/inc/custom/default/ticket_NLSH_validate.js)
===================================================================
---
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
(rev 0)
+++
branches/Version-1_0-branch/property/inc/custom/default/ticket_NLSH_validate.js
2014-06-05 08:44:58 UTC (rev 12007)
@@ -0,0 +1,27 @@
+
+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();
+
+ if(category_id == 20)
+ {
+ if (!feilkode_id && status_id == 'X')
+ {
+ error = true;
+ }
+ }
+
+ if(error)
+ {
+ alert('Feilkode må velges før meldingen kan avsluttes');
+ }
+ else
+ {
+ document.form.submit();
+ }
+}
+
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.view.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.view.js 2014-06-05
08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.view.js 2014-06-05
08:44:58 UTC (rev 12007)
@@ -42,7 +42,14 @@
else
{
document.getElementById(action).value = 1;
-
document.form.submit();
+ try
+ {
+
validate_submit();
+ }
+ catch
(e)
+ {
+
document.form.submit();
+ }
}
},
failure: function(o)
Modified: branches/Version-1_0-branch/property/templates/base/group_select.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/group_select.xsl
2014-06-05 08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/property/templates/base/group_select.xsl
2014-06-05 08:44:58 UTC (rev 12007)
@@ -6,7 +6,7 @@
<xsl:variable name="select_group_name">
<xsl:value-of select="select_group_name"/>
</xsl:variable>
- <select name="{$select_group_name}" class="forms"
title="{$lang_group_statustext}">
+ <select name="{$select_group_name}" id="group_id" class="forms"
title="{$lang_group_statustext}">
<option value="">
<xsl:value-of select="lang_no_group"/>
</option>
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2014-06-05
08:40:52 UTC (rev 12006)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2014-06-05
08:44:58 UTC (rev 12007)
@@ -36,7 +36,7 @@
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
- <form ENCTYPE="multipart/form-data" name="form" method="post"
action="{$form_action}">
+ <form ENCTYPE="multipart/form-data" id="form" name="form"
method="post" action="{$form_action}">
<div class="yui-navset" id="ticket_tabview">
<div class="yui-content">
<table cellpadding="2" cellspacing="2"
width="80%" align="center">
@@ -148,7 +148,7 @@
</label>
</td>
<td>
-
<select name="values[status]">
+
<select id="status_id" name="values[status]">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Set the status of
the ticket')"/>
</xsl:attribute>
@@ -274,7 +274,7 @@
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
- <form name="form" method="post"
action="{$form_action}">
+ <form name="form" method="post" id="form"
action="{$form_action}">
<xsl:call-template
name="location_view"/>
<tr>
<td valign="top">
@@ -431,7 +431,7 @@
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
- <form ENCTYPE="multipart/form-data" name="form" method="post"
action="{$form_action}">
+ <form ENCTYPE="multipart/form-data" id="form" name="form"
method="post" action="{$form_action}">
<div class="yui-navset" id="ticket_tabview">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
<div class="yui-content">
@@ -628,7 +628,7 @@
</label>
</td>
<td>
-
<select name="values[status]" class="forms">
+
<select id="status_id" name="values[status]"
class="forms">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'Set the status of the ticket')"/>
</xsl:attribute>
@@ -1055,7 +1055,7 @@
</label>
</td>
<td>
-
<select name="values[status]" class="forms">
+
<select id="status_id" name="values[status]"
class="forms">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'Set the status of the ticket')"/>
</xsl:attribute>
@@ -1310,7 +1310,7 @@
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
- <form name="form" method="post"
action="{$form_action}">
+ <form id="form" name="form" method="post"
action="{$form_action}">
<tr class="th">
<td class="th_text"
valign="top">
<xsl:value-of
select="lang_ticket"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12007] Merge 12003:12006 from trunk,
Sigurd Nes <=