[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17189] Merge 17174:17188 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17189] Merge 17174:17188 from trunk |
|
Date: |
Sun, 22 Oct 2017 15:15:24 -0400 (EDT) |
Revision: 17189
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17189
Author: sigurdne
Date: 2017-10-22 15:15:24 -0400 (Sun, 22 Oct 2017)
Log Message:
-----------
Merge 17174:17188 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl
branches/Version-2_0-branch/booking/inc/class.sodocumentation.inc.php
branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
branches/Version-2_0-branch/booking/templates/base/application.xsl
branches/Version-2_0-branch/booking/templates/base/booking.xsl
branches/Version-2_0-branch/booking/templates/base/report_freetime.xsl
branches/Version-2_0-branch/bookingfrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId2.php
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_info.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_info.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_filters.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_month_no_loc.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_year_no_loc.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
branches/Version-2_0-branch/controller/templates/base/case/add_case.xsl
branches/Version-2_0-branch/controller/templates/base/case/case_row.xsl
branches/Version-2_0-branch/controller/templates/base/case/cases_tab_menu.xsl
branches/Version-2_0-branch/controller/templates/base/case/view_closed_cases.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_menu.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_info.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_items.xsl
branches/Version-2_0-branch/controller/templates/base/control_item/control_item.xsl
branches/Version-2_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
branches/Version-2_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/js/portico/tts.view.js
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch 2017-10-22 19:15:24 UTC (rev 17189)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188
\ No newline at end of property
Modified:
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.hook_helper.inc.php
===================================================================
---
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.hook_helper.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.hook_helper.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -58,6 +58,7 @@
if (!empty($config->config_data['cookie_domain']))
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
- }
+ }
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl
===================================================================
---
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -14,6 +14,15 @@
<tr bgcolor="{row_off}">
<td colspan="2"><b>{Registration_settings}</b></td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_on">
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking 2017-10-22 19:15:24 UTC (rev 17189)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/inc/class.sodocumentation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.sodocumentation.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking/inc/class.sodocumentation.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -210,7 +210,7 @@
if ($this->db->next_record())
{
$id = $this->db->f('id', false);
- return
sprintf('index.php?menuaction=bookingfrontend.uidocumentation.download&id=%s',
$id);
+ return
$GLOBALS['phpgw']->link('/bookingfrontend/index.php', array('menuaction' =>
'bookingfrontend.uidocumentation.download', 'id'=> $id));
}
return null;
}
@@ -221,7 +221,7 @@
if ($this->db->next_record())
{
$id = $this->db->f('id', false);
- return
sprintf('index.php?menuaction=booking.uidocumentation.download&id=%s', $id);
+ return $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'booking.uidocumentation.download', 'id'=> $id));
}
return null;
}
Modified: branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -289,6 +289,26 @@
{
$season =
$this->season_bo->read_single(phpgw::get_var('season_id', 'int'));
array_set_default($_POST, 'resources', array());
+
+ if(empty($_POST['organization_id']))
+ {
+ $application_id =
phpgw::get_var('application_id', 'int', 'POST');
+ if($application_id)
+ {
+ $application =
createObject('booking.boapplication')->read_single($application_id);
+ if($organization_number =
$application['customer_organization_number'])
+ {
+ $organizations =
createObject('booking.soorganization')->read(array('filters' =>
array('organization_number' => $organization_number,
+ 'active' =>
1)));
+
+
$_POST['organization_id'] = $organizations['results'][0]['id'];
+
$_POST['organization_name'] = $organizations['results'][0]['name'];
+ }
+ }
+
+ }
+
+
$allocation = extract_values($_POST,
$this->fields);
if ($_POST['cost'])
{
Modified: branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -393,6 +393,18 @@
$season =
$this->season_bo->read_single(phpgw::get_var('season_id','int', 'POST'));
$booking['organization_id'] =
phpgw::get_var('organization_id','int', 'POST');
$booking['organization_name'] =
phpgw::get_var('organization_name','string', 'POST');
+ if($application_id &&
empty($booking['organization_id']))
+ {
+ $application =
createObject('booking.boapplication')->read_single($application_id);
+ if($organization_number =
$application['customer_organization_number'])
+ {
+ $organizations =
createObject('booking.soorganization')->read(array('filters' =>
array('organization_number' => $organization_number,
+ 'active' => 1)));
+
+ $_POST['organization_id'] =
$organizations['results'][0]['id'];
+ $_POST['organization_name'] =
$organizations['results'][0]['name'];
+ }
+ }
$noallocation = True;
}
if ($_SERVER['REQUEST_METHOD'] == 'POST')
Modified: branches/Version-2_0-branch/booking/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/application.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking/templates/base/application.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -296,10 +296,13 @@
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
eventParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="event_params"/>;
+
var allocationaddURL = phpGWLink('index.php',
{menuaction:'booking.uiallocation.add'});
+
var bookingaddURL = phpGWLink('index.php',
{menuaction:'booking.uibooking.add'});
+
var eventaddURL = phpGWLink('index.php', {menuaction:'booking.uievent.add'});
</script>
<div
class="pure-control-group">
<label> </label>
-
<select name="create" onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
+
<select name="create" onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl(allocationaddURL, allocationParams[{id}]);
if(this.selectedIndex==2) JqueryPortico.booking.postToUrl(bookingaddURL,
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl(eventaddURL, eventParams[{id}]);">
<xsl:if test="not(../case_officer/is_current_user)">
<xsl:attribute name="disabled">disabled</xsl:attribute>
</xsl:if>
Modified: branches/Version-2_0-branch/booking/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/booking.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking/templates/base/booking.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -84,8 +84,8 @@
var resourceIds = '<xsl:value-of
select="booking/resource_ids"/>';
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Resource Type')"/>;
<![CDATA[
- var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
- ]]>
+ var resourcesURL = phpGWLink('index.php', {menuaction:
'booking.uiresource.index', sort:'name'}, true) + '&' + resourceIds;
+ ]]>
var colDefsResources = [{key: 'name', label: lang['Name'],
formatter: genericLink}, {key: 'type', label: lang['Resource Type']}];
createTable('resources_container',resourcesURL,colDefsResources);
</script>
Modified: branches/Version-2_0-branch/booking/templates/base/report_freetime.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/report_freetime.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/booking/templates/base/report_freetime.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -161,8 +161,9 @@
<td>
<script type="text/javascript">
eventParams[<xsl:value-of select="counter"/>] = <xsl:value-of
select="event_params"/>;
+
var eventaddURL = phpGWLink('index.php',
{menuaction:'menuaction=booking.uievent.add'});
</script>
-
<a href="#"
onclick="JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{counter}]);">Lag arrangement</a>
+
<a href="#" onclick="JqueryPortico.booking.postToUrl(eventaddURL,
eventParams[{counter}]);">Lag arrangement</a>
</td>
</tr>
</xsl:for-each>
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-10-22 12:43:20 UTC (rev
17188)
+++ branches/Version-2_0-branch/bookingfrontend 2017-10-22 19:15:24 UTC (rev
17189)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173,17175-17188
\ No newline at end of property
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.hook_helper.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.hook_helper.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -59,5 +59,6 @@
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
}
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -384,7 +384,7 @@
$allocation['resource'] = phpgw::get_var('resource');
$allocation['resource_info'] = join(', ', $res_names);
$allocation['building_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.show',
- 'id' =>
$allocation['resources'][0]['building_id']));
+ 'id' => $allocation['building_id']));
$allocation['org_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uiorganization.show',
'id' =>
$allocation['organization_id']));
$bouser = CreateObject('bookingfrontend.bouser');
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1182,7 +1182,7 @@
}
$booking['resource_info'] = join(', ', $res_names);
$booking['building_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.show',
- 'id' =>
$booking['resources'][0]['building_id']));
+ 'id' => $booking['building_id']));
$booking['org_link'] = self::link(array('menuaction' =>
'bookingfrontend.uiorganization.show',
'id' =>
$booking['group']['organization_id']));
$booking['group_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uigroup.show',
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -46,7 +46,7 @@
protected function get_user_org_id()
{
- $ipdp = sha1($_SERVER['HTTP_UID']);
+ $ipdp = $_SERVER['HTTP_UID'];
$bregorgs = $this->get_breg_orgs($ipdp);
$myorgnr = array();
if ($bregorgs == array())
@@ -100,8 +100,9 @@
}
}
- private function get_breg_orgs( $fodselsnr )
+ private function get_breg_orgs( $fodselsnr = '')
{
+ $hash = sha1($fodselsnr);
$db = createObject('phpgwapi.db', null, null, true);
$db->Host =
$GLOBALS['phpgw_domain']['default']['db_host'];
@@ -125,7 +126,7 @@
));
}
- $sql = "SELECT DISTINCT orgnr FROM breg.personcurrent
WHERE fodselsnr ='{$fodselsnr}'";
+ $sql = "SELECT DISTINCT orgnr FROM breg.personcurrent
WHERE fodselsnr ='{$hash}'";
$orgs_validate = array();
$results = array();
@@ -140,7 +141,6 @@
$orgs_validate[] = $organization_number;
}
- $hash = sha1($fodselsnr);
$ssn = '{SHA1}' . base64_encode($hash);
$this->db->query("SELECT
bb_organization.organization_number, bb_organization.name AS organization_name"
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId2.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId2.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId2.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -42,11 +42,16 @@
public function __construct()
{
parent::__construct();
+
+ if (!empty($this->config->config_data['debug']))
+ {
+ $this->debug = true;
+ }
}
protected function get_user_org_id()
{
- $ipdp = sha1($_SERVER['HTTP_UID']);
+ $ipdp = $_SERVER['HTTP_UID'];
$bregorgs = $this->get_breg_orgs($ipdp);
$myorgnr = array();
if ($bregorgs == array())
@@ -109,6 +114,25 @@
{
$results = array();
+ /**
+ * Her kaller du tjenesten som gjør spørringen mot
Brønnøysund.
+ * $fodselsnr er som det skal være (ikke hash)
+ */
+ $orgs =
$this->get_orgs_from_external_service($fodselsnr);
+
+ if($orgs && is_array($orgs))
+ {
+ foreach ($orgs as $org)
+ {
+ $results[] = array
+ (
+ 'orgnr' => $org['orgnr']
+ );
+
+ $orgs_validate[] = $org['orgnr'];
+ }
+ }
+
if ($this->debug)
{
$results[] = array
@@ -115,8 +139,79 @@
(
'orgnr' => 964965226
);
+ $orgs_validate[] = 964965226;
+
}
+ $hash = sha1($fodselsnr);
+ $ssn = '{SHA1}' . base64_encode($hash);
+
+ $this->db->query("SELECT
bb_organization.organization_number, bb_organization.name AS organization_name"
+ . " FROM bb_delegate"
+ . " JOIN bb_organization ON
bb_delegate.organization_id = bb_organization.id"
+ . " WHERE bb_delegate.ssn = '{$ssn}'",
__LINE__, __FILE__);
+
+ while($this->db->next_record())
+ {
+ $organization_number =
$this->db->f('organization_number');
+ if(in_array($organization_number,
$orgs_validate))
+ {
+ continue;
+ }
+ $results[] = array
+ (
+ 'orgnr' => $organization_number
+ );
+
+ $orgs_validate[] = $organization_number;
+
+ }
+
return $results;
}
+
+
+ private function get_orgs_from_external_service($fodselsnr)
+ {
+ $apikey = !empty($this->config->config_data['apikey'])
? $this->config->config_data['apikey'] :
'45090934oidtgj3Dtgijr3GrtiorthrtpiRTHSRhoRTHrthoijrtgrsSERgerthoijRDTeortigjesrgERHGeihjoietrh';
+ $webservicehost =
!empty($this->config->config_data['webservicehost']) ?
$this->config->config_data['webservicehost'] : '';
+
+ if(!$webservicehost || !$apikey)
+ {
+ throw new Exception('Missing parametres for
webservice');
+ }
+
+ $post_data = array
+ (
+ 'apikey' => $apikey,
+ 'id' => $fodselsnr
+ );
+ foreach ( $post_data as $key => $value)
+ {
+ $post_items[] = $key . '=' . $value;
+ }
+
+ $post_string = implode ('&', $post_items);
+
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+ curl_setopt($ch, CURLOPT_URL, $webservicehost);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, array(
'Content-Type: application/json'));
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $post_string);
+ $result = curl_exec($ch);
+
+ $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ curl_close($ch);
+
+ $ret = json_decode($result, true);
+ if(isset($ret['orgnr']))
+ {
+ return array($ret);
+ }
+ else
+ {
+ return $ret;
+ }
+ }
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
2017-10-22 19:15:24 UTC (rev 17189)
@@ -291,8 +291,7 @@
function populateTableChkRegulations(building_id, selection, resources)
{
- var url =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'
+ building_id;
-// var url = phpGWLink('bookingfrontend/', {menuaction:
'booking.uidocument_view.regulations', sort: 'name', 'owner[]':
'building::'+building_id}, true);
+ var url = phpGWLink('bookingfrontend/', {menuaction:
'booking.uidocument_view.regulations', sort: 'name'}, true) +
'&owner[]=building::' + building_id;
for (var r in resources)
{
url += '&owner[]=resource::' + resources[r];
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_info.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_info.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_info.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -8,7 +8,7 @@
</dt>
<dd>
<a href="{allocation/building_link}">
- <xsl:value-of
select="allocation/resources[position()=1]/building_name"/>
+ <xsl:value-of
select="allocation/building_name"/>
</a>
(<xsl:value-of select="allocation/resource_info"/>)
</dd>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -250,8 +250,11 @@
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
eventParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="event_params"/>;
+ var
allocationaddURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'booking.uiallocation.add'});
+ var
bookingaddURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'booking.uibooking.add'});
+ var eventaddURL
= phpGWLink('bookingfrontend/index.php', {menuaction:'booking.uievent.add'});
</script>
- <select name="create"
onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
+ <select name="create"
onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl(allocationaddURL, allocationParams[{id}]);
if(this.selectedIndex==2) JqueryPortico.booking.postToUrl(bookingaddURL,
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl(eventaddURL, eventParams[{id}]);">
<xsl:if
test="not(../case_officer/is_current_user)">
<xsl:attribute name="disabled">disabled</xsl:attribute>
</xsl:if>
@@ -518,12 +521,11 @@
var resources = <xsl:value-of select="application/resources" />;
<![CDATA[
- var resourcesURL =
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&phpgw_return_as=json&'
+ resourceIds;
- var applicationURL =
'index.php?menuaction=bookingfrontend.uiapplication.associated&phpgw_return_as=json&filter_application_id='
+ app_id;
- var documentURL =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'
+ building_id;
- documentURL +=
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=resource::'+
resources;
- var attachmentsResourceURL =
'index.php?menuaction=bookingfrontend.uidocument_application.index&sort=name&no_images=1&filter_owner_id='
+ app_id + '&phpgw_return_as=json&';
-
+ var resourcesURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uiresource.index_json', sort:'name'}, true) +'&' +
resourceIds;
+ var applicationURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uiapplication.associated',
filter_application_id:app_id}, true);
+ var documentURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'booking.uidocument_view.regulations', sort:'name'}, true) +
'&owner[]=building::' + building_id;
+ documentURL += '&owner[]=resource::'+ resources;
+ var attachmentsResourceURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_application.index', sort:'name',
no_images:1, filter_owner_id:app_id}, true);
]]>
if (resourceIds) {
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -71,9 +71,8 @@
<script type="text/javascript">
var resourcesIds = '<xsl:value-of select="booking/resource_ids"
/>';
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Resource Type')" />;
-
<![CDATA[
- var resourceURL =
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&phpgw_return_as=json&'
+ resourcesIds;
+ var resourceURL = phpGWLink('bookingfrontend/index.php',
{menuaction: 'bookingfrontend.uiresource.index_json', sort:'name'}, true) + '&'
+ resourcesIds;
]]>
var colDefsResources = [{key: 'name', label: lang['Name'],
formatter: genericLink}, {key: 'type', label: lang['Resource Type']}];
createTable('resources_container', resourceURL,
colDefsResources, 'results');
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_info.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/booking_info.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/booking_info.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -14,7 +14,7 @@
</dt>
<dd>
<a href="{booking/building_link}">
- <xsl:value-of
select="booking/resources[position()=1]/building_name"/>
+ <xsl:value-of select="booking/building_name"/>
</a>
(<xsl:value-of select="booking/resource_info"/>)
</dd>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -140,10 +140,10 @@
var lang = <xsl:value-of
select="php:function('js_lang', 'Name', 'Category', 'Activity', 'Resource
Type')"/>;
var address = '<xsl:value-of select="street"/>,
<xsl:value-of select="zip_code"/>, <xsl:value-of select="city"/>';
<![CDATA[
- var resourcesURL =
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&';
- var documentURL =
'index.php?menuaction=bookingfrontend.uidocument_building.index&sort=name&no_images=1&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
- var building_usersURL =
'index.php?menuaction=bookingfrontend.uiorganization.building_users&sort=name&building_id='
+ building_id + '&phpgw_return_as=json&';
- var document_buildingURL =
'index.php?menuaction=bookingfrontend.uidocument_building.index_images&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ var resourcesURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uiresource.index_json',sort:'name',
filter_building_id:building_id}, true);
+ var documentURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_building.index', sort:'name',
no_images:1, filter_owner_id:building_id}, true);
+ var building_usersURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uiorganization.building_users', sort:'name',
building_id:building_id}, true);
+ var document_buildingURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_building.index_images', sort:'name',
filter_owner_id:building_id}, true);
var iurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&output=embed&geocode=&q=' +
address;
var linkurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&geocode=&q=' + address;
]]>
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -28,6 +28,15 @@
</select>
</td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_on">
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
@@ -49,6 +58,14 @@
<td><input name="newsettings[login_parameter]"
value="{value_login_parameter}"></td>
</tr>
<tr class="row_off">
+ <td>{lang_login_apikey} MinId2:</td>
+ <td><input name="newsettings[apikey]"
value="{value_apikey}"></td>
+ </tr>
+ <tr class="row_off">
+ <td>{lang_login_webservicehost} MinId2:</td>
+ <td><input name="newsettings[webservicehost]"
value="{value_webservicehost}"></td>
+ </tr>
+ <tr class="row_off">
<td>{lang_login_header_key}:</td>
<td><input name="newsettings[header_key]"
value="{value_header_key}"></td>
</tr>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -86,8 +86,8 @@
var address = '<xsl:value-of
select="resource/building/street"/>, <xsl:value-of
select="resource/building/zip_code"/>, <xsl:value-of
select="resource/building/city"/>';
<![CDATA[
- var documentsResourceURL =
'index.php?menuaction=bookingfrontend.uidocument_resource.index&sort=name&no_images=1&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
- var documentsResourceImagesURL =
'index.php?menuaction=bookingfrontend.uidocument_resource.index_images&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+ var documentsResourceURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_resource.index', sort:'name',
no_images:1, filter_owner_id:resource_id}, true);
+ var documentsResourceImagesURL =
phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidocument_resource.index_images', sort:'name',
filter_owner_id:resource_id}, true);
var iurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&output=embed&geocode=&q=' +
address;
var linkurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&geocode=&q=' + address;
]]>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_filters.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_filters.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_filters.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -2,7 +2,7 @@
<xsl:template name="calendar_filters" xmlns:php="http://php.net/xsl";>
<xsl:param name="view_period" />
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<form id="cal-filters" class="select-box" method="post">
<xsl:choose>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_month_no_loc.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_month_no_loc.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_month_no_loc.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -2,7 +2,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<script>
<xsl:text>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_year_no_loc.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_year_no_loc.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/calendar_year_no_loc.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -2,7 +2,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<script>
<xsl:text>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -4,7 +4,7 @@
<xsl:param name="location_code" />
<xsl:param name="serie_id" />
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<xsl:choose>
<xsl:when test="current_month_nr > 1">
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -5,7 +5,7 @@
<xsl:param name="serie_id" />
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<a class="showPrev">
<xsl:attribute name="href">
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,7 +1,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:variable name="serie_id"><xsl:value-of select="serie_id" /></xsl:variable>
<script>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -2,7 +2,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:variable name="location_code"><xsl:value-of select="location_code"
/></xsl:variable>
<xsl:variable name="serie_id"><xsl:value-of select="serie_id" /></xsl:variable>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:variable name="serie_id"><xsl:value-of select="serie_id" /></xsl:variable>
<script>
Modified:
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,7 +1,7 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:variable name="location_code"><xsl:value-of select="location_code"
/></xsl:variable>
<xsl:variable name="serie_id"><xsl:value-of select="serie_id" /></xsl:variable>
Modified:
branches/Version-2_0-branch/controller/templates/base/case/add_case.xsl
===================================================================
--- branches/Version-2_0-branch/controller/templates/base/case/add_case.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/controller/templates/base/case/add_case.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
Modified:
branches/Version-2_0-branch/controller/templates/base/case/case_row.xsl
===================================================================
--- branches/Version-2_0-branch/controller/templates/base/case/case_row.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/controller/templates/base/case/case_row.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -3,7 +3,7 @@
<xsl:template name="case_row" xmlns:php="http://php.net/xsl";>
<xsl:param name="control_item_type" />
- <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+ <xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<li class="check_item_case">
<xsl:choose>
<xsl:when test="cases_array/child::node()">
Modified:
branches/Version-2_0-branch/controller/templates/base/case/cases_tab_menu.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/case/cases_tab_menu.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/case/cases_tab_menu.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<xsl:template name="cases_tab_menu" xmlns:php="http://php.net/xsl";>
<xsl:param name="active_tab" />
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div class="tab_menu">
<a id="view_open_cases">
Modified:
branches/Version-2_0-branch/controller/templates/base/case/view_closed_cases.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/case/view_closed_cases.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/case/view_closed_cases.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="session_url">&
+ <xsl:variable name="session_url"><xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,7 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" name="edit_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,5 +1,5 @@
<xsl:template name="add_check_list_menu" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="session_url">&
+ <xsl:variable name="session_url"><xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_menu.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_menu.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_menu.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<xsl:template name="check_list_menu" xmlns:php="http://php.net/xsl";>
<xsl:param name="active_tab" />
- <xsl:variable name="session_url">&
+ <xsl:variable name="session_url"><xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<xsl:template name="check_list_top_section" xmlns:php="http://php.net/xsl";>
<xsl:param name="active_tab" />
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<!-- ================== CHECKLIST DETAILS INFO ========================= -->
<div id="check-list-heading">
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,5 +1,5 @@
<xsl:template name="nav_control_plan" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="session_url">&
+ <xsl:variable name="session_url"><xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_info.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_info.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_info.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,7 +1,7 @@
<!-- $Id: edit_check_list.xsl 8478 2012-01-03 12:36:37Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
<script>
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_items.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_items.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/view_control_items.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="control-items">
<h2>Kontrollpunkter</h2>
Modified:
branches/Version-2_0-branch/controller/templates/base/control_item/control_item.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/control_item/control_item.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/control_item/control_item.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -2,7 +2,7 @@
<!-- item -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
Modified:
branches/Version-2_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,6 +1,6 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
Modified:
branches/Version-2_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -1,7 +1,7 @@
<!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="session_url">&
+ <xsl:variable name="session_url"><xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -86,7 +86,7 @@
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] = $config['cookie_domain'];
}
-
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
public function login( )
@@ -207,12 +207,12 @@
$message = 'Velg organisasjon';
$org_select = <<<HTML
-
+
<label for="session_org_id">Velg
Organisasjon:</label>
<select name="session_org_id"
id="session_org_id">
{$org_option}
</select>
-
+
HTML;
}
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -38,6 +38,15 @@
</select>
</td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr>
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
Modified:
branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -80,6 +80,6 @@
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
}
-// $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -148,7 +148,7 @@
{
$this->_db =&
$GLOBALS['phpgw']->db;
$use_cookies = false;
- $GLOBALS['phpgw']->hooks->process('set_cookie_domain',
array('mobilefrontend', 'bookingfrontend', 'activitycalendarfrontend'));
+ $GLOBALS['phpgw']->hooks->process('set_cookie_domain',
array('eventplannerfrontend','mobilefrontend', 'bookingfrontend',
'activitycalendarfrontend'));
if (
isset($GLOBALS['phpgw_info']['server']['usecookies'])
&&
$GLOBALS['phpgw_info']['server']['usecookies'] == 'True' )
{
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-10-22
12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2017-10-22
19:15:24 UTC (rev 17189)
@@ -1995,15 +1995,18 @@
conflicts = (conflicts) ? conflicts : {};
if (type == "booking")
{
- link = 'index.php?menuaction=booking.uibooking.edit&id=' + id;
+ link = phpGWLink('index.php',
{menuaction:'booking.uibooking.edit', id:id});
+// link = 'index.php?menuaction=booking.uibooking.edit&id=' + id;
}
else if (type == "allocation")
{
- link = 'index.php?menuaction=booking.uiallocation.edit&id=' +
id;
+ link = phpGWLink('index.php',
{menuaction:'booking.uiallocation.edit', id:id});
+// link = 'index.php?menuaction=booking.uiallocation.edit&id=' +
id;
}
else if (type == "event")
{
- link = 'index.php?menuaction=booking.uievent.edit&id=' + id;
+ link = phpGWLink('index.php',
{menuaction:'booking.uievent.edit', id:id});
+// link = 'index.php?menuaction=booking.uievent.edit&id=' + id;
}
text = formatGenericLink(name, link);
if (type == "event" && conflicts.length > 0)
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-10-22 19:15:24 UTC (rev 17189)
@@ -187,7 +187,7 @@
if (filter_select != filter_selected){
if (filter_depends) {
<![CDATA[
-
JqueryPortico.autocompleteHelper('index.php?menuaction=' + app + '.ui'+ui+'.' +
FunctionName + '&filter_'+depends+'_id='+filter_depends+'&',
+
JqueryPortico.autocompleteHelper(phpGWLink('index.php', {menuaction:app +
'.ui'+ui+'.' + FunctionName}) + '&filter_'+depends+'_id='+filter_depends+'&',
'filter_'+name+'_name',
'filter_'+name+'_id', 'filter_'+name+'_container', label_attr, show_id,
requestGenerator);
]]>
}
@@ -202,7 +202,7 @@
filter_depends = false;
if (!filter_depends) {
<![CDATA[
-
JqueryPortico.autocompleteHelper('index.php?menuaction=' + app + '.ui'+ ui +
'.' + FunctionName +'&',
+
JqueryPortico.autocompleteHelper(phpGWLink('index.php', {menuaction:app +
'.ui'+ui+'.' + FunctionName}) +'&',
'filter_'+name+'_name',
'filter_'+name+'_id', 'filter_'+name+'_container', label_attr, show_id,
requestGenerator);
]]>
}
@@ -215,12 +215,12 @@
</xsl:if>
if (filter_depends) {
<![CDATA[
-
JqueryPortico.autocompleteHelper('index.php?menuaction=' + app + '.ui'+ui+'.' +
FunctionName + '&filter_'+depends+'_id='+filter_depends+'&',
+
JqueryPortico.autocompleteHelper(phpGWLink('index.php', {menuaction:app +
'.ui'+ui+'.' + FunctionName}) + '&filter_'+depends+'_id='+filter_depends+'&',
'filter_'+name+'_name', 'filter_'+name+'_id',
'filter_'+name+'_container', label_attr, show_id, requestGenerator);
]]>
}else{
<![CDATA[
-
JqueryPortico.autocompleteHelper('index.php?menuaction=' + app + '.ui'+ui+'.' +
FunctionName + '&',
+
JqueryPortico.autocompleteHelper(phpGWLink('index.php', {menuaction:app +
'.ui'+ui+'.' + FunctionName}) + '&',
'filter_'+name+'_name', 'filter_'+name+'_id',
'filter_'+name+'_container', label_attr, show_id, requestGenerator);
]]>
}
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-10-22 12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-10-22 19:15:24 UTC (rev 17189)
@@ -3130,9 +3130,21 @@
ExecMethod('property.bofiles.get_file',
phpgw::get_var('file_id', 'int'));
}
- public function get_vendor_contract($vendor_id = 0, $selected =
'')
+ public function get_vendor_contract($vendor_id = 0, $selected =
0)
{
- return $this->bocommon->get_vendor_contract($vendor_id,
$selected);
+ $contract_list =
$this->bocommon->get_vendor_contract($vendor_id, $selected);
+ if($contract_list)
+ {
+ array_unshift($contract_list, array('id' => -1,
'name' => lang('outside contract')));
+ }
+ if($selected)
+ {
+ foreach ($contract_list as &$contract)
+ {
+ $contract['selected'] = $selected ==
$contract['id'] ? 1 : 0;
+ }
+ }
+ return $contract_list;
}
Modified: branches/Version-2_0-branch/property/js/portico/tts.view.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/tts.view.js 2017-10-22
12:43:20 UTC (rev 17188)
+++ branches/Version-2_0-branch/property/js/portico/tts.view.js 2017-10-22
19:15:24 UTC (rev 17189)
@@ -205,7 +205,16 @@
return;
}
- htmlString = "<option value=''>" +
data.length + " kontrakter funnet</option>"
+ if(data.length > 0)
+ {
+//
$("#vendor_contract_id").attr("data-validation", "required");
+ htmlString = "<option value=''>
kontrakter funnet</option>";
+ }
+ else
+ {
+ htmlString = "<option value=''>
kontrakter ikke funnet</option>";
+ }
+
var obj = data;
$.each(obj, function (i)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17189] Merge 17174:17188 from trunk,
sigurdne <=