[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11918] Merge 11907:11917 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11918] Merge 11907:11917 from trunk |
|
Date: |
Thu, 24 Apr 2014 08:35:35 +0000 |
Revision: 11918
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11918
Author: sigurdne
Date: 2014-04-24 08:35:35 +0000 (Thu, 24 Apr 2014)
Log Message:
-----------
Merge 11907:11917 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
branches/Version-1_0-branch/frontend/templates/base/base.css
branches/Version-1_0-branch/frontend/templates/base/entityview.xsl
branches/Version-1_0-branch/phpgwapi/templates/base/datatable.xsl
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.boevent.inc.php
branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
branches/Version-1_0-branch/property/js/yahoo/entity.index.js
branches/Version-1_0-branch/property/js/yahoo/property.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/entity.xsl
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
Added Paths:
-----------
branches/Version-1_0-branch/property/js/yahoo/lookup.generic.index.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
+
/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
Modified: branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -41,6 +41,7 @@
'index' => true,
'download' => true,
'view' => true,
+ 'edit' => true,
);
public function __construct()
@@ -114,13 +115,30 @@
foreach($_subs as $entry)
{
$_org_units[$entry['id']] =
true;
+ if(isset($entry['children']) &&
$entry['children'])
+ {
+
$this->_get_children($entry['children'], $_org_units);
+ }
}
}
}
$org_units = array_keys($_org_units);
-
$this->bo->org_units = $org_units;
+ }
+ /**
+ * Get the sublevels of the org tree into one arry
+ */
+ private function _get_children($data = array(), &$_org_units)
+ {
+ foreach ($data as $entry)
+ {
+ $_org_units[$entry['id']] = true;
+ if(isset($entry['children']) &&
$entry['children'])
+ {
+
$this->_get_children($entry['children'], $_org_units);
+ }
+ }
}
@@ -725,6 +743,24 @@
);
}
+ if($this->acl_add)
+ {
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name' =>
'add_tinybox',
+ 'text' =>
lang('add'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uientity.edit',
+ 'location_id' =>
$location_id,
+ 'lean'
=> true,
+ 'noframework' => true,
+ 'target'
=> '_tinybox',
+ )),
+ 'parameters'
=> array('parameter' => array(array('name'=> 'dummy','source' => 'id')))
+ );
+ }
+
$GLOBALS['phpgw']->js->validate_file('tinybox2',
'packed' , 'property');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
@@ -986,6 +1022,25 @@
public function view()
{
+ if(!$this->acl_read)
+ {
+ return;
+ }
+ $this->edit(null, $mode = 'view');
+ }
+
+ /**
+ * Prepare data for view and edit - depending on mode
+ *
+ * @param array $values populated object in case of retry
+ * @param string $mode edit or view
+ * @param int $id entity id - no id means 'new'
+ *
+ * @return void
+ */
+
+ public function edit($values = array(), $mode = 'edit')
+ {
$bo = & $this->bo;
$id = phpgw::get_var('id');
$values = $bo->read_single(array('id' => $id,
'entity_id' => $this->entity_id, 'cat_id' => $this->cat_id, 'view' => true));
@@ -1213,7 +1268,7 @@
$msglog =
phpgwapi_cache::session_get('frontend','msgbox');
phpgwapi_cache::session_clear('frontend','msgbox');
-
+
$data = array(
'header' => $this->header_state,
'msgbox_data' => isset($msglog) ?
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))
: array(),
@@ -1226,7 +1281,15 @@
'menuaction' => 'frontend.uientity.index',
'location_id' => $this->location_id
)),
-
+ 'entityedit' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+
'menuaction' => 'frontend.uientity.edit',
+
'location_id' => $this->location_id,
+
'id' => $id
+ )),
+ 'location_id' =>
$this->location_id,
+ 'id' => $id,
'entity' => $entity,
'entityhistory' =>
$entityhistory2,
'custom_attributes' =>
array('attributes' => $values['attributes']),
@@ -1253,6 +1316,8 @@
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'entity.view', 'frontend' );
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
+ $GLOBALS['phpgw']->js->validate_file( 'tinybox2',
'packed', 'phpgwapi' );
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend',
'entityview','attributes_view'));
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view', 'files'),
PHPGW_SERVER_ROOT . '/property/templates/base');
Modified: branches/Version-1_0-branch/frontend/templates/base/base.css
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/base.css
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/frontend/templates/base/base.css
2014-04-24 08:35:35 UTC (rev 11918)
@@ -515,6 +515,8 @@
margin-left: 5px;
}
+div#paging {
+ margin-top: 40px;
+ }
-
Modified: branches/Version-1_0-branch/frontend/templates/base/entityview.xsl
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/entityview.xsl
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/frontend/templates/base/entityview.xsl
2014-04-24 08:35:35 UTC (rev 11918)
@@ -21,6 +21,24 @@
<xsl:for-each select="myColumnDefs">
myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
</xsl:for-each>
+
+ showlightbox_edit_entity = function(location_id, id)
+ {
+ var oArgs = {menuaction:'property.uientity.edit',
location_id:location_id, id: id, noframework:1, lean: 1};
+ var sUrl = phpGWLink('index.php', oArgs);
+
+ TINY.box.show({iframe:sUrl,
boxid:'frameless',width:750,height:550,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true,
+ close: true,
+ closejs:function(){refresh_entity(location_id, id)}
+ });
+ }
+
+ refresh_entity = function(location_id, id)
+ {
+ parent.location.reload();
+ }
+
+
</script>
<table cellpadding="2" cellspacing="2" width="95%" align="center">
@@ -45,6 +63,11 @@
<li style="margin-bottom: 1em;">
<a href="{entitylist}"> <<
<xsl:value-of select="php:function('lang', 'show all entities')"/></a>
</li>
+ <li style="margin-bottom: 1em;">
+ <a href="#"
onclick="showlightbox_edit_entity({location_id},{id});">
+ <xsl:value-of
select="php:function('lang', 'edit')"/>
+ </a>
+ </li>
<li>
<xsl:choose>
<xsl:when
test="location_data!=''">
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/datatable.xsl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/datatable.xsl
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/datatable.xsl
2014-04-24 08:35:35 UTC (rev 11918)
@@ -307,6 +307,9 @@
<xsl:when test="type='link'">
<a id="{id}" href="#" onclick="{url}"
tabindex="{tab_index}"><xsl:value-of select="value"/></a>
</xsl:when>
+ <xsl:when test="type='label_org_unit'">
+ <table><tbody><tr><td><span
id="txt_org_unit"></span></td></tr></tbody></table>
+ </xsl:when>
<xsl:when test="type='label_date'">
<table><tbody><tr><td><span
id="txt_start_date"></span></td></tr><tr><td><span
id="txt_end_date"></span></td></tr></tbody></table>
</xsl:when>
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -46,6 +46,7 @@
var $results;
var $acl_location;
public $org_units = array();
+ public $org_unit;
protected $xsl_rootdir;
/**
@@ -96,7 +97,17 @@
$allrows
= phpgw::get_var('allrows', 'bool');
$criteria_id =
phpgw::get_var('criteria_id');
$p_num
= phpgw::get_var('p_num');
+ $org_unit_id =
phpgw::get_var('org_unit_id', 'int');
+ if($location_id = phpgw::get_var('location_id', 'int'))
+ {
+ $location_info =
$GLOBALS['phpgw']->locations->get_name($location_id);
+ $location_arr = explode('.',
$location_info['location']);
+ $type = $location_arr[1];
+ $entity_id = $location_arr[2];
+ $cat_id = $location_arr[3];
+ }
+
$this->criteria_id =
isset($criteria_id) && $criteria_id ? $criteria_id : '';
$location_code =
phpgw::get_var('location_code');
@@ -188,6 +199,10 @@
{
$this->allrows = $allrows;
}
+ if(isset($_POST['org_unit_id']) ||
isset($_GET['org_unit_id']))
+ {
+ $this->org_unit_id = $org_unit_id;
+ }
$this->xsl_rootdir = PHPGW_SERVER_ROOT .
'/property/templates/base';
}
@@ -341,10 +356,40 @@
return
$this->bocommon->select_list($selected,$criteria);
}
+ /**
+ * Get the sublevels of the org tree into one arry
+ */
+ private function _get_children($data = array() )
+ {
+ foreach ($data as $entry)
+ {
+ $this->org_units[]= $entry['id'];
+ if(isset($entry['children']) &&
$entry['children'])
+ {
+
$this->_get_children($entry['children']);
+ }
+ }
+ }
+
function read($data= array())
{
+ if($this->org_unit_id && !$this->org_units)
+ {
+ $_org_unit_id = (int)$this->org_unit_id;
+ $_subs =
execMethod('property.sogeneric.read_tree',array('node_id' => $_org_unit_id,
'type' => 'org_unit'));
+ $this->org_units[]= $_org_unit_id;
+ foreach($_subs as $entry)
+ {
+ $this->org_units[]= $entry['id'];
+ if(isset($entry['children']) &&
$entry['children'])
+ {
+
$this->_get_children($entry['children']);
+ }
+ }
+ }
+
static $location_data = array();
- static $org_units = array();
+ static $org_units_data = array();
if(isset($this->allrows) && $this->allrows)
{
@@ -479,12 +524,12 @@
}
if(isset($entry['org_unit_id']))
{
-
if(!isset($org_units[$entry['org_unit_id']]))
+
if(!isset($org_units_data[$entry['org_unit_id']]))
{
$org_unit =
$sogeneric->read_single(array('id' => $entry['org_unit_id']));
-
$org_units[$entry['org_unit_id']]['name'] = $org_unit['name'];
+
$org_units_data[$entry['org_unit_id']]['name'] = $org_unit['name'];
}
- $entry['org_unit'] =
$org_units[$entry['org_unit_id']]['name'];
+ $entry['org_unit'] =
$org_units_data[$entry['org_unit_id']]['name'];
}
}
//_debug_array($entity);die();
Modified: branches/Version-1_0-branch/property/inc/class.boevent.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boevent.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/inc/class.boevent.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -434,14 +434,15 @@
if($data['enabled'] &&
!$this->so->check_event_exception($id,$data['time']))
{
- list($module, $classname) = explode('.',
$data['action'], 2);
- if ( is_file(PHPGW_INCLUDE_ROOT .
"/{$module}/class.{$classname}.inc.php") )
+ list($module, $classname) = explode('.',
$data['action'], 3);
+ $file = PHPGW_INCLUDE_ROOT .
"/{$module}/inc/class.{$classname}.inc.php";
+ if ( is_file($file) )
{
$message = execMethod($data['action'],
$data);
}
else
{
- $message = "No such file:
{$module}/class.{$classname}.inc.php";
+ $message = "No such file: {$file}";
}
$this->so->cron_log(array
@@ -569,20 +570,24 @@
{
$parts = explode('::',$data['id']);
$id = $parts[1];
- $location_arr = explode($parts[0]);
+ $location_arr = explode('.', $parts[0]);
$interlink = CreateObject('property.interlink');
- $relation_link =
$interlink->get_relation_link($location_arr[1], $id, 'view', true);
+ $relation_link =
$interlink->get_relation_link(".{$location_arr[1]}", $id, 'view', true);
$responsible_id =
isset($data['action_data']['responsible_id']) ?
$data['action_data']['responsible_id'] : 0;
if(!$responsible_id)
{
return false;
}
- $comms =
execMethod('addressbook.boaddressbook.get_comm_contact_data',$responsible_id);
- $_address = $comms[$entry['contact_id']]['work email'];
+ $account_id =
$GLOBALS['phpgw']->accounts->search_person($responsible_id);
+ $socommon = CreateObject('property.socommon');
+ $prefs =
$socommon->create_preferences('property',$account_id);
+ $comms =
execMethod('addressbook.boaddressbook.get_comm_contact_data',$responsible_id);
+ $_address = isset($comms[$responsible_id]['work
email']) && $comms[$responsible_id]['work email'] ?
$comms[$responsible_id]['work email'] :$prefs['email'];
+
$subject = lang('reminder');
- $message = '<a href ="{$relation_link}">' .
lang('record').' #' .$id .'</a>'."\n";
+ $message = "<a href =\"{$relation_link}\">" .
lang('record').' #' .$id .'</a>'."\n";
if (!is_object($GLOBALS['phpgw']->send))
{
$GLOBALS['phpgw']->send =
CreateObject('phpgwapi.send');
Modified: branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -56,7 +56,7 @@
$start =
phpgw::get_var('start', 'int', 'REQUEST', 0);
$query =
phpgw::get_var('query');
- $sort =
phpgw::get_var('sort');
+ $sort =
phpgw::get_var('sort', 'string', 'REQUEST', 'DESC');
$order =
phpgw::get_var('order');
$filter =
phpgw::get_var('filter', 'int');
$cat_id =
phpgw::get_var('cat_id', 'int');
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -491,10 +491,6 @@
{
$filtermethod .= " $where (
$entity_table.org_unit_id IN(" . implode(',',$org_units) . "))";
}
- else
- {
- return array();
- }
}
$_config =
CreateObject('phpgwapi.config',$this->type_app[$this->type]);
@@ -1286,10 +1282,6 @@
$filtermethod .= " $where (
$entity_table.org_unit_id IN(" . implode(',',$org_units) . "))";
$where= 'AND';
}
- else
- {
- return array();
- }
}
if ($filter=='all')
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -120,6 +120,11 @@
{
$GLOBALS['phpgw_info']['flags']['menu_selection'] .= "::{$this->cat_id}";
}
+ if(phpgw::get_var('noframework', 'bool'))
+ {
+ $GLOBALS['phpgw_info']['flags']['noframework']
= true;
+ }
+
}
@@ -690,6 +695,33 @@
),
array
(//for
link "None",
+
'type'=> 'label_org_unit'
+ ),
+ array
+ (
//hidden org_unit_id
+
'type' => 'hidden',
+
'id' => 'org_unit_id',
+
'name' => 'org_unit_id',
+
'value' => $org_unit_id
+ ),
+ array
+ (//for
link "Org unit",
+
'type'=> 'link',
+
'id' => 'btn_org_unit_search',
+
'url' => "Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
+
array
+
(
+
'menuaction' =>
'property.uilookup.custom',
+
'column' => 'org_unit',
+
'type' => 'org_unit',
+
// 'get_list_function_input' =>
urlencode(serialize(array('type' => 'org_unit')))
+
)
+
)."','link','width=640,height=600')",
+
'value' => lang('department'),
+
'tab_index' => 6
+ ),
+ array
+ (//for
link "None",
'type'=> 'label_date'
),
array
@@ -715,7 +747,7 @@
(
'menuaction' =>
'property.uiproject.date_search'))."','link','width=350,height=250')",
'value' => lang('Date search'),
-
'tab_index' => 6
+
'tab_index' => 5
)),
'hidden_value'
=> array
(
@@ -1393,6 +1425,7 @@
function edit($mode = 'edit')
{
$id = phpgw::get_var('id', 'int');
+ $_lean = phpgw::get_var('lean', 'bool');
if($mode == 'edit' && (!$this->acl_add &&
!$this->acl_edit))
{
@@ -1789,7 +1822,9 @@
'id' => $id,
'entity_id' =>
$this->entity_id,
'cat_id' =>
$this->cat_id,
- 'type' => $this->type
+ 'type' => $this->type,
+ 'lean' => $_lean,
+ 'noframework' =>
isset($GLOBALS['phpgw_info']['flags']['noframework']) ?
$GLOBALS['phpgw_info']['flags']['noframework'] : false
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -2478,7 +2513,8 @@
"entity_id:'{$this->entity_id}',".
"cat_id:'{$this->cat_id}',".
"type:'{$this->type}'}",
- 'documents'
=> $documents
+ 'documents'
=> $documents,
+ 'lean'
=> $_lean ? 1 : 0
);
phpgwapi_yui::load_widget('dragdrop');
Modified: branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2014-04-24 08:35:35 UTC (rev 11918)
@@ -3451,8 +3451,8 @@
function custom()
{
- $get_list_function =
phpgw::get_var('get_list_function');
- $get_list_function_input =
urlencode(phpgw::get_var('get_list_function_input'));
+ $type = phpgw::get_var('type');
+ // $get_list_function_input =
urlencode(phpgw::get_var('get_list_function_input'));
$column =
phpgw::get_var('column');
if( phpgw::get_var('phpgw_return_as') != 'json' )
@@ -3463,8 +3463,8 @@
'cat_id'
=> $this->cat_id,
'query'
=> $this->query,
'filter'
=> $this->filter,
- 'get_list_function' =>
$get_list_function,
- 'get_list_function_input' =>
$get_list_function_input
+ 'type'
=> $type,
+// 'get_list_function_input' =>
$get_list_function_input
));
$datatable['config']['allow_allrows'] = true;
@@ -3472,8 +3472,8 @@
."cat_id:'{$this->cat_id}',"
."query:'{$this->query}',"
."filter:'{$this->filter}',"
-
."get_list_function:'{$get_list_function}',"
-
."get_list_function_input:'{$get_list_function_input}'";
+ ."type:'{$type}'";
+//
."get_list_function_input:'{$get_list_function_input}'";
$datatable['actions']['form'] = array
(
@@ -3486,8 +3486,8 @@
'cat_id'
=> $this->cat_id,
'query'
=> $this->query,
'filter'
=> $this->filter,
-
'get_list_function' => $get_list_function,
-
'get_list_function_input' => $get_list_function_input
+ 'type' =>
$type,
+//
'get_list_function_input' => $get_list_function_input
)
),
'fields' => array
@@ -3521,30 +3521,13 @@
);
}
- $uicols = array (
- 'input_type' => array('text','text'),
- 'name' =>
array('id','name'),
- 'formatter' => array('',''),
- 'descr' =>
array(lang('ID'),lang('name'))
- );
+ $bogeneric = CreateObject('property.bogeneric');
+
$bogeneric->get_location_info(phpgw::get_var('type','string'));
+ $values = $bogeneric->read();
- $values = array();
- // $bo = CreateObject('property.bogeneric',true);
- // $template_list = $bo->read();
-
- $template_list = execMethod($get_list_function,
unserialize(urldecode($_GET['get_list_function_input'])));
- if(isset($template_list['ResultSet']['Result']) &&
is_array($template_list['ResultSet']['Result']))
- {
- $values = $template_list['ResultSet']['Result'];
- }
- else
- {
- $values = $template_list;
- }
+ $uicols = $bogeneric->uicols;
//_debug_array($values);die();
-//_debug_array(unserialize(urldecode($get_list_function_input)));
-//_debug_array(unserialize(urldecode($_GET['get_list_function_input'])));
$content = array();
$j=0;
if (is_array($values))
@@ -3560,7 +3543,7 @@
}
}
- $uicols_count = count($uicols['descr']);
+ $uicols_count = count($uicols['name']);
$datatable['rowactions']['action'] = array();
for ($i=0;$i<$uicols_count;$i++)
{
@@ -3574,16 +3557,16 @@
$datatable['headers']['header'][$i]['sort_field'] =
$uicols['name'][$i];
}
- $custom_id = $column;
- $custom_name = $column . '_name';
-
+ $custom_id = "{$column}_id";
+ $custom_name = "{$column}_name";
+// _debug_array($datatable);die();
$function_exchange_values = '';
$function_exchange_values .=
'opener.document.getElementsByName("'.$custom_id.'")[0].value = "";' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$custom_name.'")[0].value = "";' ."\r\n";
+ $function_exchange_values .=
"opener.document.getElementById('txt_{$column}').innerHTML = '';\r\n";
$function_exchange_values .=
'opener.document.getElementsByName("'.$custom_id.'")[0].value =
data.getData("id");' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$custom_name.'")[0].value =
data.getData("name");' ."\r\n";
+ $function_exchange_values .=
"opener.document.getElementById('txt_{$column}').innerHTML =
data.getData('name');\r\n";
$function_exchange_values .= 'window.close()';
@@ -3605,12 +3588,12 @@
$datatable['pagination']['records_start'] =
(int)$this->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
$datatable['pagination']['records_returned']=
count($values);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
+ $datatable['pagination']['records_total'] =
$bogeneric->total_records;
if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
{
$datatable['sorting']['order']
= 'id'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'name'; // ASC / DESC
+ $datatable['sorting']['sort']
= 'ASC'; // ASC / DESC
}
else
{
@@ -3669,7 +3652,7 @@
{
return $json;
}
-
+// _debug_array($json);die();
$datatable['json_data'] = json_encode($json);
//-------------------- JSON CODE ----------------------
@@ -3684,10 +3667,9 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
// Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.tenant.index', 'property' );
+ $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.generic.index', 'property' );
$this->save_sessiondata();
}
-
}
Modified: branches/Version-1_0-branch/property/js/yahoo/entity.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/entity.index.js
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/js/yahoo/entity.index.js
2014-04-24 08:35:35 UTC (rev 11918)
@@ -33,7 +33,8 @@
// define the hidden column in datatable
var config_values = {
- date_search : 1 //if search has link "Data search"
+ date_search : 1, //if search has link "Data search"
+ org_unit_search : 1 //if search has link "Org unit search"
}
var linktoolTips =[
Copied: branches/Version-1_0-branch/property/js/yahoo/lookup.generic.index.js
(from rev 11917, trunk/property/js/yahoo/lookup.generic.index.js)
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/lookup.generic.index.js
(rev 0)
+++ branches/Version-1_0-branch/property/js/yahoo/lookup.generic.index.js
2014-04-24 08:35:35 UTC (rev 11918)
@@ -0,0 +1,68 @@
+//--------------------------------------------------------
+// Declaration of lookup.tenant.index vars
+//--------------------------------------------------------
+
+ //define SelectButton
+ var selectsButtons = [
+ ]
+
+ // define buttons
+ var oNormalButton_0;
+ var normalButtons = [
+ {order:0, name:'btn_search', funct:"onSearchClick"}
+ ]
+
+/********************************************************************************/
+ var FormatterRight = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<div align=\"right\">"+oData+"</div>";
+ }
+
+
+ // define Text buttons
+ var textImput = [
+ {order:0, name:'query', id:'txt_query'}
+ ]
+
+ // define the hidden column in datatable
+ var config_values = {
+ date_search : 0 //if search has link "Data search"
+ }
+/****************************************************************************************/
+
+ this.particular_setting = function()
+ {
+ if(flag_particular_setting=='init')
+ {
+ //--focus for txt_query---
+ YAHOO.util.Dom.get(textImput[0].id).focus();
+ }
+ else if(flag_particular_setting=='update')
+ {
+ // nothing
+ }
+ }
+/****************************************************************************************/
+
+ YAHOO.util.Event.addListener(window, "load", function()
+ {
+
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display =
'none';
+ var loader = new YAHOO.util.YUILoader();
+ loader.addModule({
+ name: "anyone", //module name; must be unique
+ type: "js", //can be "js" or "css"
+ fullpath: property_js //'property_js' have the path for
property.js, is render in HTML
+ });
+
+ loader.require("anyone");
+
+ //Insert JSON utility on the page
+
+ loader.insert();
+ });
+
+
+
+
+
+
Modified: branches/Version-1_0-branch/property/js/yahoo/property.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property.js 2014-04-24
08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/js/yahoo/property.js 2014-04-24
08:35:35 UTC (rev 11918)
@@ -277,6 +277,17 @@
sUrl=html_entity_decode(sUrl);
window.open(sUrl,'_self');
}
+ if(values_ds.rights[i].my_name == 'add_tinybox')
+ {
+ //NEW is always the last options in arrays
RIGHTS
+ sUrl = values_ds.rights[i].action;
+ //Convert all HTML entities to their applicable
characters
+ sUrl=html_entity_decode(sUrl);
+ TINY.box.show({iframe:sUrl,
boxid:'frameless',width:750,height:550,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true,
+ close: true,
+ closejs:function(){parent.location.reload()}
+ });
+ }
}
}
@@ -360,6 +371,10 @@
path_values.start_date =
YAHOO.util.Dom.get('start_date').value;
path_values.end_date =
YAHOO.util.Dom.get('end_date').value;
}
+ if(config_values.org_unit_search !=
undefined && config_values.org_unit_search != 0)
+ {
+ path_values.org_unit_id =
YAHOO.util.Dom.get('org_unit_id').value;
+ }
execute_ds();
}
},
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-04-24
08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-04-24
08:35:35 UTC (rev 11918)
@@ -777,10 +777,11 @@
enter the workorder id to search by workorder - at any date property
no angi bestilling ID for å søke etter bestilling - gjelder alle datoer
enter workorder title property no angi bestillings tittel
entity property no type
-entity has been added property no Entitet er lagt til
-entity has been edited property no Entitet er rettet
-entity has not been edited property no Entitet er IKKE rettet
-entity has not been saved property no Entitet er IKKE lagret
+entity has been added property no Post er lagt til
+entity has been edited property no Post er oppdatert
+entity %1 has been edited property no Post %1 er oppdatert
+entity has not been edited property no Post er IKKE oppdatert
+entity has not been saved property no Post er IKKE lagret
entity id property no entitet ID
entity name property no entitet navn
entity not chosen property no Entitet er ikke valgt
@@ -1270,6 +1271,8 @@
please enter a value for either material cost, labour cost or both !
property no angi enten material kostnader, arbeidskostnader eller
begge
please enter a workorder title ! property no Angi en
bestillings tittel
please enter either a budget or contrakt sum property no Angi
enten budsjett eller konstraktsum (eller begge)
+Please enter value for attribute %1 property no Angi verdi for
felt %1
+Please enter integer for attribute %1 property no Angi heltall
for felt %1
please enter precision as integer ! property no Angi heltall
for presisjon
please enter scale as integer ! property no Angi heltall
for skalering
please give som details ! property no Angi detaljer
Modified: branches/Version-1_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/entity.xsl
2014-04-24 08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/property/templates/base/entity.xsl
2014-04-24 08:35:35 UTC (rev 11918)
@@ -455,7 +455,9 @@
<xsl:when test="mode = 'edit'">
<tr>
<td colspan="2"
align="center">
-
<xsl:call-template name="table_apply"/>
+
<xsl:call-template name="table_apply">
+
<xsl:with-param name="lean" select="lean"/>
+
</xsl:call-template>
</td>
</tr>
</xsl:when>
@@ -755,7 +757,9 @@
<table cellpadding="2"
cellspacing="2" width="80%" align="center">
<tr height="50">
<td colspan="2"
align="center">
-
<xsl:call-template name="table_apply"/>
+
<xsl:call-template name="table_apply">
+
<xsl:with-param name="lean" select="lean"/>
+
</xsl:call-template>
</td>
</tr>
</table>
@@ -763,7 +767,7 @@
</xsl:choose>
</form>
<xsl:choose>
- <xsl:when test="value_id!=''">
+ <xsl:when test="value_id!='' and lean !=1">
<table cellpadding="2" cellspacing="2"
width="80%" align="center">
<tr>
<xsl:choose>
@@ -834,19 +838,25 @@
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; name="table_apply">
+ <xsl:param name="lean" />
+
<table>
<tr>
+ <xsl:choose>
+ <xsl:when test="$lean!=1">
+ <td valign="bottom">
+ <xsl:variable
name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'save')"/>
+ </xsl:variable>
+ <input type="submit"
name="values[save]" value="{$lang_save}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'save values and exit')"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </xsl:when>
+ </xsl:choose>
<td valign="bottom">
- <xsl:variable name="lang_save">
- <xsl:value-of
select="php:function('lang', 'save')"/>
- </xsl:variable>
- <input type="submit"
name="values[save]" value="{$lang_save}">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'save values and exit')"/>
- </xsl:attribute>
- </input>
- </td>
- <td valign="bottom">
<xsl:variable name="lang_apply">
<xsl:value-of
select="php:function('lang', 'apply')"/>
</xsl:variable>
@@ -856,16 +866,20 @@
</xsl:attribute>
</input>
</td>
- <td align="right" valign="bottom">
- <xsl:variable name="lang_cancel">
- <xsl:value-of
select="php:function('lang', 'cancel')"/>
- </xsl:variable>
- <input type="submit"
name="values[cancel]" value="{$lang_cancel}">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'Back to the list')"/>
- </xsl:attribute>
- </input>
- </td>
+ <xsl:choose>
+ <xsl:when test="$lean!=1">
+ <td align="right"
valign="bottom">
+ <xsl:variable
name="lang_cancel">
+ <xsl:value-of
select="php:function('lang', 'cancel')"/>
+ </xsl:variable>
+ <input type="submit"
name="values[cancel]" value="{$lang_cancel}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'Back to the list')"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </xsl:when>
+ </xsl:choose>
</tr>
</table>
</xsl:template>
Modified: branches/Version-1_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2014-04-24
08:31:52 UTC (rev 11917)
+++ branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2014-04-24
08:35:35 UTC (rev 11918)
@@ -240,7 +240,8 @@
from rental no Fra
from email setting rental no E-post adresse systemmeldinger (Fra)
frontpage_was_reset rental no Oppsettet på forsiden ble nullstilt
-frontpage_reset_setup rental no Nullstill oppsett
+frontpage_reset_setup rental no Nullstill oppsett
+frontend_access rental no Gå til frontend som valgt leietaker
f_select_columns rental no Velg kolonner
furnish_type rental no Møbleringsstatus
furnish_type_not_specified rental no Ikke spesifisert
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11918] Merge 11907:11917 from trunk,
Sigurd Nes <=