[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11512] Merge 11509:11511 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11512] Merge 11509:11511 from trunk |
|
Date: |
Sun, 08 Dec 2013 21:01:34 +0000 |
Revision: 11512
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11512
Author: sigurdne
Date: 2013-12-08 21:01:33 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
Merge 11509:11511 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/manual/inc/class.menu.inc.php
branches/Version-1_0-branch/manual/inc/class.uidocuments.inc.php
branches/Version-1_0-branch/manual/setup/phpgw_no.lang
branches/Version-1_0-branch/manual/templates/base/documents_add.xsl
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
branches/Version-1_0-branch/mobilefrontend/home.php
branches/Version-1_0-branch/mobilefrontend/inc/class.bocommon.inc.php
branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/mobilefrontend/login.php
branches/Version-1_0-branch/mobilefrontend/logout.php
branches/Version-1_0-branch/mobilefrontend/property/class.uilocation.inc.php
branches/Version-1_0-branch/mobilefrontend/property/class.uilookup.inc.php
branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/js/yahoo/tts.index.js
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
Added Paths:
-----------
branches/Version-1_0-branch/manual/js/portico/documents.view.js
branches/Version-1_0-branch/mobilefrontend/manual/
Property Changed:
----------------
branches/Version-1_0-branch/
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
branches/Version-1_0-branch/mobilefrontend/home.php
branches/Version-1_0-branch/mobilefrontend/inc/class.bocommon.inc.php
branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/mobilefrontend/inc/class.menu.inc.php
branches/Version-1_0-branch/mobilefrontend/login.php
branches/Version-1_0-branch/mobilefrontend/logout.php
branches/Version-1_0-branch/mobilefrontend/property/class.uilocation.inc.php
branches/Version-1_0-branch/mobilefrontend/property/class.uilookup.inc.php
branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
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
+
/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
Modified: branches/Version-1_0-branch/manual/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/manual/inc/class.menu.inc.php 2013-12-08
20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/manual/inc/class.menu.inc.php 2013-12-08
21:01:33 UTC (rev 11512)
@@ -95,6 +95,12 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php', array( 'menuaction' =>
'manual.uidocuments.add' )),
'image' => array('property',
'location_1'),
),
+ 'view' => array
+ (
+ 'text' => lang('view'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array( 'menuaction' =>
'manual.uidocuments.view' )),
+ 'image' => array('property',
'location_1'),
+ ),
);
if (
isset($GLOBALS['phpgw_info']['user']['apps']['preferences']) )
Modified: branches/Version-1_0-branch/manual/inc/class.uidocuments.inc.php
===================================================================
--- branches/Version-1_0-branch/manual/inc/class.uidocuments.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/manual/inc/class.uidocuments.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -43,17 +43,8 @@
'add' => true,
'edit' => true,
'save' => true,
- 'delete' => true,
- 'delete_imported_records' => true,
- 'get_vendors' => true,
- 'get_users' => true,
- 'edit_survey_title' => true,
'get_files' => true,
- 'get_request' => true,
- 'get_summation' => true,
'view_file' => true,
- 'import' => true,
- 'download' => true
);
public function __construct()
@@ -369,6 +360,7 @@
if($mode == 'view')
{
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] = "manual::view";
if( !$this->acl_read)
{
$this->bocommon->no_access();
@@ -384,7 +376,6 @@
}
}
-
$categories = $this->_get_categories($cat_id);
@@ -393,10 +384,12 @@
$file_def = array
(
array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
- array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true),
);
+ if($mode == 'edit')
+ {
+ $file_def[1]= array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true);
+ }
-
$datatable_def = array();
$datatable_def[] = array
(
@@ -423,13 +416,13 @@
self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
self::add_javascript('phpgwapi', 'yui3',
'gallery-formvalidator/gallery-formvalidator-min.js');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
+ self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+ self::add_javascript('manual', 'portico',
'documents.add.js');
}
- self::add_javascript('manual', 'portico',
'documents.add.js');
+ self::add_javascript('manual', 'portico',
'documents.view.js');
- self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
-
// $GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
self::render_template_xsl(array('documents_add'),
$data);
@@ -491,21 +484,38 @@
return;
}
+ $cat_filter = array();
+ if($cat_id)
+ {
+ $cats = CreateObject('phpgwapi.categories',
-1, 'manual', $this->acl_location);
+ $cats->supress_info = true;
+ $cat_list_files = $cats->return_sorted_array(0,
false, '', '', '', false, $cat_id, false);
+ $cat_filter[] = $cat_id;
+ foreach ($cat_list_files as $_category)
+ {
+ $cat_filter[] = $_category['id'];
+ }
+ }
+
$link_file_data = array
(
'menuaction' =>
'manual.uidocuments.view_file',
'cat_id' => $cat_id
);
+ $files = array();
$link_view_file = self::link($link_file_data);
$vfs = CreateObject('phpgwapi.vfs');
$vfs->override_acl = 1;
- $files = $vfs->ls(array(
- 'string' => "/manual/{$cat_id}",
- 'relatives' => array(RELATIVE_NONE)));
+ foreach ($cat_filter as $_cat_id)
+ {
+ $files = array_merge($files, $vfs->ls(array(
+ 'string' => "/manual/{$_cat_id}",
+ 'relatives' => array(RELATIVE_NONE))));
+ }
$vfs->override_acl = 0;
@@ -549,7 +559,7 @@
'ResultSet' => array(
'totalResultsAvailable' =>
$total_records,
'startIndex' => $start,
- 'sortKey' => 'type',
+ 'sortKey' => 'file_name',
'sortDir' => "ASC",
'Result' => $values,
'pageSize' => $num_rows,
@@ -582,7 +592,6 @@
$cat_id = phpgw::get_var('cat_id', 'int',
'REQUEST');
$file_name =
html_entity_decode(urldecode(phpgw::get_var('file_name')));
$file =
"{$bofiles->fakebase}/{$cat_id}/{$file_name}";
-
$bofiles->view_file('',$file);
}
Copied: branches/Version-1_0-branch/manual/js/portico/documents.view.js (from
rev 11511, trunk/manual/js/portico/documents.view.js)
===================================================================
--- branches/Version-1_0-branch/manual/js/portico/documents.view.js
(rev 0)
+++ branches/Version-1_0-branch/manual/js/portico/documents.view.js
2013-12-08 21:01:33 UTC (rev 11512)
@@ -0,0 +1,7 @@
+ function refresh_files()
+ {
+ var cat_id = document.getElementById("cat_id").value;
+ var oArgs = {menuaction:'manual.uidocuments.get_files',
cat_id:cat_id};
+ var strURL = phpGWLink('index.php', oArgs, true);
+ YAHOO.portico.updateinlineTableHelper('datatable-container_0',
strURL);
+ }
Modified: branches/Version-1_0-branch/manual/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/manual/setup/phpgw_no.lang 2013-12-08
20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/manual/setup/phpgw_no.lang 2013-12-08
21:01:33 UTC (rev 11512)
@@ -10,4 +10,8 @@
Please give som details manual no Angi beskrivelse
send manual no Send
support common no Support
-
+filename common no Filnavn
+no category common no Ingen kategori
+documents common no Dokumenter
+click to view file manual no Klikk for å laste ned
+manual common no Manual
Modified: branches/Version-1_0-branch/manual/templates/base/documents_add.xsl
===================================================================
--- branches/Version-1_0-branch/manual/templates/base/documents_add.xsl
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/manual/templates/base/documents_add.xsl
2013-12-08 21:01:33 UTC (rev 11512)
@@ -61,11 +61,9 @@
</select>
</xsl:when>
<xsl:otherwise>
- <xsl:for-each
select="categories/options">
- <xsl:if
test="selected = 'selected' or selected = 1">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
-
</xsl:if>
- </xsl:for-each>
+ <select
id="cat_id" name="cat_id" onChange="refresh_files();">
+
<xsl:apply-templates select="categories/options"/>
+ </select>
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -93,25 +91,30 @@
</dl>
</div>
</div>
- <dl class="proplist-col">
- <div class="form-buttons">
- <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="editable = 1">
-
<xsl:variable name="lang_save"><xsl:value-of select="php:function('lang',
'save')" /></xsl:variable>
- <input
type="submit" name="save_project" value="{$lang_save}" title = "{$lang_save}" />
- <input
class="button" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:variable name="lang_edit"><xsl:value-of select="php:function('lang',
'edit')" /></xsl:variable>
-
<xsl:variable name="lang_new_survey"><xsl:value-of select="php:function('lang',
'new')" /></xsl:variable>
- <input
type="button" name="edit_survey" value="{$lang_edit}" title = "{$lang_edit}"
onClick="document.load_edit_form.submit();"/>
- <input
type="button" name="new_survey" value="{$lang_new_survey}" title =
"{$lang_new_survey}" onClick="document.new_form.submit();"/>
- <input
class="button" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </dl>
+ <xsl:choose>
+ <xsl:when test="editable = 1">
+ <dl class="proplist-col">
+ <div
class="form-buttons">
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
+ <xsl:choose>
+
<xsl:when test="editable = 1">
+
<xsl:variable name="lang_save"><xsl:value-of select="php:function('lang',
'save')" /></xsl:variable>
+
<input type="submit" name="save_project" value="{$lang_save}" title =
"{$lang_save}" />
+
<input class="button" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:variable name="lang_edit"><xsl:value-of select="php:function('lang',
'edit')" /></xsl:variable>
+
<xsl:variable name="lang_new_survey"><xsl:value-of select="php:function('lang',
'new')" /></xsl:variable>
+
<input type="button" name="edit_survey" value="{$lang_edit}" title =
"{$lang_edit}" onClick="document.load_edit_form.submit();"/>
+
<input type="button" name="new_survey" value="{$lang_new_survey}" title =
"{$lang_new_survey}" onClick="document.new_form.submit();"/>
+
<input class="button" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
+
</xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </dl>
+ </xsl:when>
+ </xsl:choose>
+
</form>
</div>
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -26,7 +26,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicalendar.inc.php 10753 2013-02-06 06:52:12Z
vator $
+ * @version $Id$
*/
phpgw::import_class('controller.uicalendar');
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol.inc.php 10804 2013-02-13 13:24:06Z
sigurdne $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicheck_list.inc.php 10834 2013-02-14 12:57:59Z
vator $
+ * @version $Id$
*/
phpgw::import_class('controller.uicheck_list');
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicheck_list_for_component.inc.php 10631
2013-01-02 09:15:56Z vator $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol.inc.php 10804 2013-02-13 13:24:06Z
sigurdne $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol_group.inc.php 10633 2013-01-02
09:21:05Z vator $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol_group_component.inc.php 10810
2013-02-13 19:49:14Z sigurdne $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol_item.inc.php 10787 2013-02-11 12:55:58Z
vator $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -26,7 +26,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol_register_to_component.inc.php 10810
2013-02-13 19:49:14Z sigurdne $
+ * @version $Id$
*/
phpgw::import_class('controller.uicontrol_register_to_component');
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -26,7 +26,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicontrol_register_to_location.inc.php 10810
2013-02-13 19:49:14Z sigurdne $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uidocument.inc.php 10346 2012-10-25 06:27:55Z vator $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uiprocedure.inc.php 10789 2013-02-11 13:01:07Z
vator $
+ * @version $Id$
*/
Property changes on:
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/mobilefrontend/home.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/home.php 2013-12-08 20:57:07 UTC
(rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/home.php 2013-12-08 21:01:33 UTC
(rev 11512)
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgroupware
- * @version $Id: home.php 2094 2009-01-12 14:29:43Z sigurd $
+ * @version $Id$
*/
/**
Property changes on: branches/Version-1_0-branch/mobilefrontend/home.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/mobilefrontend/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/inc/class.bocommon.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/inc/class.bocommon.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php 10997 2013-03-18 11:56:29Z
sigurdne $
+ * @version $Id$
*/
/**
Property changes on:
branches/Version-1_0-branch/mobilefrontend/inc/class.bocommon.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2013 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package controller
- * @version $Id: class.hook_helper.inc.php 10919 2013-02-18 14:47:02Z
sigurdne $
+ * @version $Id$
*/
/*
Property changes on:
branches/Version-1_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/mobilefrontend/inc/class.menu.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/mobilefrontend/login.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/login.php 2013-12-08
20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/login.php 2013-12-08
21:01:33 UTC (rev 11512)
@@ -8,7 +8,7 @@
* @copyright Copyright (C) 2013 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgroupware
- * @version $Id: login.php 9960 2012-09-02 18:56:26Z sigurdne $
+ * @version $Id$
*/
require_once '../phpgwapi/inc/class.login.inc.php';
Property changes on: branches/Version-1_0-branch/mobilefrontend/login.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/mobilefrontend/logout.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/logout.php 2013-12-08
20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/logout.php 2013-12-08
21:01:33 UTC (rev 11512)
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgroupware
- * @version $Id: logout.php 6669 2010-12-11 22:27:07Z sigurdne $
+ * @version $Id$
*/
$GLOBALS['phpgw_info'] = array();
Property changes on: branches/Version-1_0-branch/mobilefrontend/logout.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/property/class.uilocation.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/property/class.uilocation.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++
branches/Version-1_0-branch/mobilefrontend/property/class.uilocation.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage tts
- * @version $Id: class.uitts.inc.php 10753 2013-02-06 06:52:12Z vator $
+ * @version $Id$
*/
phpgw::import_class('property.uilocation');
Property changes on:
branches/Version-1_0-branch/mobilefrontend/property/class.uilocation.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/property/class.uilookup.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/property/class.uilookup.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/property/class.uilookup.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage tts
- * @version $Id: class.uilookup.inc.php 10753 2013-02-06 06:52:12Z
vator $
+ * @version $Id$
*/
phpgw::import_class('property.uilookup');
Property changes on:
branches/Version-1_0-branch/mobilefrontend/property/class.uilookup.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage tts
- * @version $Id: class.uitts.inc.php 10753 2013-02-06 06:52:12Z vator $
+ * @version $Id$
*/
phpgw::import_class('property.uitts');
Property changes on:
branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -74,6 +74,8 @@
'current_user' => $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] )->__toString()
);
+ $tpl_vars['manual_text'] = lang('manual');
+ $tpl_vars['manual_url'] = $GLOBALS['phpgw']->link('/index.php', array(
'menuaction' => 'manual.uidocuments.view' ));
$tpl_vars['home_text'] = lang('home');
$tpl_vars['home_url'] = $GLOBALS['phpgw']->link('/home.php');
$tpl_vars['logout_text'] = lang('logout');
Modified: branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
2013-12-08 21:01:33 UTC (rev 11512)
@@ -33,6 +33,7 @@
<div id="wrapper">
<div id="header">
<div id="login-bar">
+ <a href="{manual_url}">{manual_text}</a>
<a href="{home_url}">{home_text}</a>
<a href="{logout_url}">{logout_text}</a>
</div>
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -52,6 +52,7 @@
public $total_records = 0;
public $sum_budget = 0;
public $sum_actual_cost = 0;
+ public $sum_difference = 0;
public $show_finnish_date = false;
public $simple = false;
@@ -258,6 +259,12 @@
'id' => 'actual_cost',
'name'=> lang('actual cost')
);
+
+ $columns['difference'] = array
+ (
+ 'id' => 'difference',
+ 'name'=> lang('difference')
+ );
}
$columns['vendor'] = array
@@ -492,9 +499,10 @@
'ecodimb' => $this->ecodimb, 'b_account' =>
$this->b_account, 'building_part' => $this->building_part,
'branch_id' => $this->branch_id ,'order_dim1'
=> $this->order_dim1));
- $this->total_records = $this->so->total_records;
- $this->sum_budget = $this->so->sum_budget;
- $this->sum_actual_cost = $this->so->sum_actual_cost;
+ $this->total_records =
$this->so->total_records;
+ $this->sum_budget =
$this->so->sum_budget;
+ $this->sum_actual_cost =
$this->so->sum_actual_cost;
+ $this->sum_difference =
$this->so->sum_difference;
if(!$external)
{
@@ -511,6 +519,17 @@
$this->uicols_related = array('project');
}
+
+ $custom_status = $this->so->get_custom_status();
+ $closed_status = array('X');
+ foreach($custom_status as $custom)
+ {
+ if($custom['closed'])
+ {
+ $closed_status[] = "C{$custom['id']}";
+ }
+ }
+
foreach ($tickets as & $ticket)
{
if(!isset($category_name[$ticket['cat_id']]))
@@ -535,6 +554,19 @@
$ticket['user'] =
$account[$ticket['user_id']];
}
+
+ $ticket['difference'] = 0;
+
+
+ if($ticket['estimate'] && !in_array(
$ticket['status'], $closed_status) )
+ {
+ $ticket['difference'] =
$ticket['estimate'] - (float)$ticket['actual_cost'];
+ if($ticket['difference'] < 0)
+ {
+ $ticket['difference'] = 0;
+ }
+ }
+
if($ticket['assignedto'])
{
if(!isset($account[$ticket['assignedto']]))
Modified: branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -495,6 +495,11 @@
{
foreach($values_attribute as $entry)
{
+ if($entry['disabled'])
+ {
+ continue;
+ }
+
switch ($entry['datatype'])
{
case 'C':
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -36,11 +36,12 @@
class property_sotts
{
- var $uicols_related = array();
- var $acl_location = '.ticket';
- public $total_records = 0;
- public $sum_budget = 0;
- public $sum_actual_cost = 0;
+ var $uicols_related = array();
+ var $acl_location = '.ticket';
+ public $total_records = 0;
+ public $sum_budget = 0;
+ public $sum_actual_cost = 0;
+ public $sum_difference = 0;
public $soap_functions = array
(
@@ -492,12 +493,33 @@
'sum_actual_cost' =>
$this->db->f('sum_actual_cost'),
'sql_hash' =>
md5($sql_cnt)
);
+
+
+ $custom_status = $this->get_custom_status();
+ $closed_status = array('X');
+ foreach($custom_status as $custom)
+ {
+ if($custom['closed'])
+ {
+ $closed_status[] =
"C{$custom['id']}";
+ }
+ }
+
+ $filter_closed = "{$where}
fm_tts_tickets.status NOT IN ('" . implode("','", $closed_status) . "')";
+ $sql2 = "SELECT (sum(budget) -
sum(actual_cost)) as sum_difference FROM ({$sql_cnt} {$filter_closed}) as t";
+ $this->db->query($sql2,__LINE__,__FILE__);
+ $this->db->next_record();
+ unset($sql2);
+
+ $cache_info['sum_difference'] =
(int)$this->db->f('sum_difference');
+
phpgwapi_cache::session_set('property','tts_listing_metadata',$cache_info);
}
$this->total_records = $cache_info['total_records'];
$this->sum_budget =
$cache_info['sum_budget'];
$this->sum_actual_cost =
$cache_info['sum_actual_cost'];
+ $this->sum_difference = $cache_info['sum_difference'];
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
@@ -863,11 +885,12 @@
while ($this->db->next_record())
{
$status[] = array
- (
- 'id' => $this->db->f('id'),
- 'name' => $this->db->f('name',
true),
- 'color' => $this->db->f('color')
- );
+ (
+ 'id' => $this->db->f('id'),
+ 'name' => $this->db->f('name',
true),
+ 'color' =>
$this->db->f('color'),
+ 'closed' =>
$this->db->f('closed')
+ );
}
return $status;
}
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2013-12-08 21:01:33 UTC (rev 11512)
@@ -227,6 +227,7 @@
{
$name[] = 'estimate';
$name[] = 'actual_cost';
+ $name[] = 'difference';
}
$uicols_related = $this->bo->uicols_related;
@@ -1184,7 +1185,8 @@
$uicols_formatter = array
(
'estimate' => 'FormatterRight',
- 'actual_cost' => 'FormatterRight'
+ 'actual_cost' => 'FormatterRight',
+ 'difference' => 'FormatterRight',
);
unset($parameters);
@@ -1264,10 +1266,12 @@
'sort'
=> $datatable['sorting']['order'],
'dir'
=> $datatable['sorting']['sort'],
'records'
=> array(),
- 'show_sum_estimate' =>
in_array('estimate', $custom_cols),//$this->acl->check('.ticket.order',
PHPGW_ACL_READ, 'property'),
+ 'show_sum_estimate' =>
in_array('estimate', $custom_cols),
'show_sum_actual_cost' =>
in_array('actual_cost', $custom_cols),
+ 'show_sum_difference' =>
in_array('difference', $custom_cols),
'sum_budget' =>
$this->bo->sum_budget,
- 'sum_actual_cost' =>
$this->bo->sum_actual_cost
+ 'sum_actual_cost' =>
$this->bo->sum_actual_cost,
+ 'sum_difference' =>
$this->bo->sum_difference,
);
// values for datatable
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.index.js 2013-12-08
20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.index.js 2013-12-08
21:01:33 UTC (rev 11512)
@@ -127,6 +127,7 @@
{
tmp_sum_budget = YAHOO.util.Number.format(values_ds.sum_budget,
{decimalPlaces:0, decimalSeparator:",", thousandsSeparator:" "});
tmp_sum_actual_cost =
YAHOO.util.Number.format(values_ds.sum_actual_cost, {decimalPlaces:2,
decimalSeparator:",", thousandsSeparator:" "});
+ tmp_sum_difference =
YAHOO.util.Number.format(values_ds.sum_difference, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
var show_estimate = false;
var show_actual_cost = false;
@@ -170,6 +171,9 @@
{
td_sum(tmp_sum_actual_cost);
}
+
+ td_sum(tmp_sum_difference);
+
td_empty(count_empty_end);
//Add to Table
myfoot = tableYUI.createTFoot();
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2013-12-08 20:57:07 UTC (rev 11511)
+++ branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2013-12-08 21:01:33 UTC (rev 11512)
@@ -85,6 +85,7 @@
<input type="hidden"
name="values_attribute[{counter}][attrib_id]" value="{id}"/>
<input type="hidden"
name="values_attribute[{counter}][nullable]" value="{nullable}"/>
<input type="hidden"
name="values_attribute[{counter}][input_text]" value="{input_text}"/>
+ <input type="hidden"
name="values_attribute[{counter}][disabled]" value="{disabled}"/>
<xsl:choose>
<xsl:when
test="datatype='R'">
<xsl:call-template name="choice"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11512] Merge 11509:11511 from trunk,
Sigurd Nes <=