[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17312] Stable: Merge 17302:17311 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17312] Stable: Merge 17302:17311 from trunk |
|
Date: |
Thu, 16 Nov 2017 02:47:15 -0500 (EST) |
Revision: 17312
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17312
Author: sigurdne
Date: 2017-11-16 02:47:14 -0500 (Thu, 16 Nov 2017)
Log Message:
-----------
Stable: Merge 17302:17311 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/inc/class.uicategories.inc.php
branches/Version-2_0-branch/admin/setup/phpgw_no.lang
branches/Version-2_0-branch/admin/templates/base/cats.xsl
branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
branches/Version-2_0-branch/controller/inc/component/class.date_generator.inc.php
branches/Version-2_0-branch/controller/setup/phpgw_no.lang
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
branches/Version-2_0-branch/controller/templates/base/config.tpl
branches/Version-2_0-branch/helpdesk/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/inc/class.categories.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/phpgwapi/templates/base/search_field.xsl
Added Paths:
-----------
branches/Version-2_0-branch/bookingfrontend/templates/aalesund/
branches/Version-2_0-branch/phpgwapi/templates/aalesund/
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch 2017-11-16 07:47:14 UTC (rev 17312)
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,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301
\ 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,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311
\ No newline at end of property
Modified: branches/Version-2_0-branch/admin/inc/class.uicategories.inc.php
===================================================================
--- branches/Version-2_0-branch/admin/inc/class.uicategories.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/admin/inc/class.uicategories.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -264,7 +264,7 @@
'start' => $this->start,
'num_records' => count($categories),
'all_records' =>
$this->bo->cats->total_records,
- 'link_data' => $link_data,
+ 'link_data' =>
array_merge($link_data, array('query' => $this->query)),
'allow_all_rows'=> true,
'allrows' => $this->allrows
);
@@ -346,13 +346,27 @@
}
$parent = $cats[0]['parent'];
+ if($this->cat_id)
+ {
+ $function = lang('edit category');
+ }
+ else
+ {
+ $function = lang('add category');
+ }
+
if ( $appname )
{
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($appname) . ' ' . $location?"::{$location}":'' . lang('global categories')
. ': ' . ($this->cat_id?lang('edit category'):lang('add category'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($appname);
+ if($location)
+ {
+
$GLOBALS['phpgw_info']['flags']['app_header'] .= "::{$location}";
+ }
+ $GLOBALS['phpgw_info']['flags']['app_header']
.= '::' . lang('global categories') . "::$function";
}
else
{
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('global categories') . ': ' . (isset($function)?$function:'');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('global categories') . "::$function";
}
$GLOBALS['phpgw']->xslttpl->add_file('cats');
Modified: branches/Version-2_0-branch/admin/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2017-11-15
19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2017-11-16
07:47:14 UTC (rev 17312)
@@ -96,3 +96,6 @@
users admin no Brukere
view the config admin no Vis konfigurasjon
warn admin no Varsel
+add category admin no Legg til kategori
+edit category admin no Endre kategori
+parent category admin no Foreldrekategori
\ No newline at end of file
Modified: branches/Version-2_0-branch/admin/templates/base/cats.xsl
===================================================================
--- branches/Version-2_0-branch/admin/templates/base/cats.xsl 2017-11-15
19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/admin/templates/base/cats.xsl 2017-11-16
07:47:14 UTC (rev 17312)
@@ -1,68 +1,66 @@
<!-- $Id$ -->
<xsl:template name="cats">
- <xsl:choose>
- <xsl:when test="cat_list">
- <xsl:apply-templates select="cat_list"/>
- </xsl:when>
- <xsl:when test="cat_edit">
- <xsl:apply-templates select="cat_edit"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="cat_list">
+ <xsl:apply-templates select="cat_list"/>
+ </xsl:when>
+ <xsl:when test="cat_edit">
+ <xsl:apply-templates select="cat_edit"/>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- BEGIN cat_list -->
<xsl:template match="cat_list">
- <center>
- <table border="0" cellspacing="2" cellpadding="2"
class="pure-table pure-table-bordered">
- <tr>
- <td colspan="6" width="100%">
- <xsl:call-template
name="nextmatchs"/>
- </td>
- </tr>
- <tr>
- <td colspan="6" width="100%" align="right">
- <xsl:call-template
name="search_field"/>
- </td>
- </tr>
- <xsl:apply-templates
select="cat_header"/>
- <xsl:apply-templates select="cat_data"/>
- </table>
- <xsl:apply-templates select="cat_add"/>
- </center>
+ <table border="0" cellspacing="2" cellpadding="2" class="pure-table
pure-table-bordered">
+ <tr>
+ <td colspan="6" width="100%">
+ <xsl:call-template name="nextmatchs"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="6" width="100%" align="right">
+ <xsl:call-template name="search_field"/>
+ </td>
+ </tr>
+ <xsl:apply-templates select="cat_header"/>
+ <xsl:apply-templates select="cat_data"/>
+ </table>
+ <xsl:apply-templates select="cat_add"/>
</xsl:template>
<!-- BEGIN cat_header -->
<xsl:template match="cat_header">
- <xsl:variable name="sort_name" select="sort_name"/>
- <xsl:variable name="sort_descr" select="sort_descr"/>
- <xsl:variable name="lang_sort_statustext"
select="lang_sort_statustext"/>
- <tr class="th">
- <td width="20%">
+ <xsl:variable name="sort_name" select="sort_name"/>
+ <xsl:variable name="sort_descr" select="sort_descr"/>
+ <xsl:variable name="lang_sort_statustext"
select="lang_sort_statustext"/>
+ <tr class="th">
+ <th width="20%">
<a href="{$sort_name}" title="{$lang_sort_statustext}"
class="th_text">
<xsl:value-of select="lang_name"/>
</a>
- </td>
- <td width="32%">
+ </th>
+ <th width="32%">
<a href="{$sort_descr}" title="{$lang_sort_statustext}"
class="th_text">
<xsl:value-of select="lang_descr"/>
</a>
- </td>
- <td width="8%" align="center">
+ </th>
+ <th width="8%" align="center">
<xsl:value-of select="lang_status"/>
- </td>
- <td width="8%" align="center">
+ </th>
+ <th width="8%" align="center">
<xsl:value-of select="lang_add_sub"/>
- </td>
- <td width="8%" align="center">
+ </th>
+ <th width="8%" align="center">
<xsl:value-of select="lang_edit"/>
- </td>
- <td width="8%" align="center">
+ </th>
+ <th width="8%" align="center">
<xsl:value-of select="lang_delete"/>
- </td>
- </tr>
+ </th>
+ </tr>
</xsl:template>
<!-- BEGIN cat_data -->
@@ -77,27 +75,27 @@
<xsl:variable name="lang_delete_statustext">
<xsl:value-of select="lang_delete_statustext"/>
</xsl:variable>
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="status != 1">
- <xsl:text> inactive</xsl:text>
- </xsl:when>
- </xsl:choose>
- </xsl:attribute>
+ <tr>
+ <xsl:attribute name="class">
<xsl:choose>
- <xsl:when test="main = 'yes'">
+ <xsl:when test="@class">
+ <xsl:value-of select="@class"/>
+ </xsl:when>
+ <xsl:when test="position() mod 2 = 0">
+ <xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="status != 1">
+ <xsl:text> inactive</xsl:text>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="main = 'yes'">
<td class="alarm">
<b>
<xsl:value-of
disable-output-escaping="yes" select="name"/>
@@ -108,8 +106,8 @@
<xsl:value-of select="descr"/>
</b>
</td>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
<td>
<xsl:value-of
disable-output-escaping="yes" select="name"/>
</td>
@@ -116,30 +114,30 @@
<td>
<xsl:value-of select="descr"/>
</td>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<td align="center">
<xsl:value-of select="status_text"/>
</td>
- <td align="center">
- <xsl:variable name="add_sub_url"
select="add_sub_url"/>
+ <td align="center">
+ <xsl:variable name="add_sub_url" select="add_sub_url"/>
<a href="{add_sub_url}"
title="{$lang_add_sub_statustext}" class="th_text">
<xsl:value-of select="lang_add_sub"/>
</a>
- </td>
- <td align="center">
- <xsl:variable name="edit_url"
select="edit_url"/>
+ </td>
+ <td align="center">
+ <xsl:variable name="edit_url" select="edit_url"/>
<a href="{edit_url}" title="{$lang_edit_statustext}"
class="th_text">
<xsl:value-of select="lang_edit"/>
</a>
- </td>
- <td align="center">
- <xsl:variable name="delete_url"
select="delete_url"/>
+ </td>
+ <td align="center">
+ <xsl:variable name="delete_url" select="delete_url"/>
<a href="{delete_url}"
title="{$lang_delete_statustext}" class="th_text">
<xsl:value-of select="lang_delete"/>
</a>
- </td>
- </tr>
+ </td>
+ </tr>
</xsl:template>
<!-- BEGIN cat_add -->
@@ -148,32 +146,32 @@
<xsl:variable name="action_url">
<xsl:value-of select="action_url"/>
</xsl:variable>
- <form method="post" action="{$action_url}">
- <table>
- <tr height="50" valign="bottom">
- <td colspan="2">
+ <form method="post" action="{$action_url}">
+ <table>
+ <tr height="50" valign="bottom">
+ <td colspan="2">
<xsl:variable name="lang_add">
<xsl:value-of
select="lang_add"/>
</xsl:variable>
- <input type="submit" name="add"
value="{$lang_add}">
- <xsl:attribute
name="title">
- <xsl:value-of
select="lang_add_statustext"/>
- </xsl:attribute>
- </input>
- </td>
- <td colspan="3" align="right">
+ <input type="submit" name="add"
value="{$lang_add}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_add_statustext"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td colspan="3" align="right">
<xsl:variable name="lang_done">
<xsl:value-of
select="lang_done"/>
</xsl:variable>
- <input type="submit"
name="done" value="{$lang_done}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="lang_done_statustext"/>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- </table>
- </form>
+ <input type="submit" name="done"
value="{$lang_done}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+ </form>
</xsl:template>
<!-- END cat_list -->
@@ -181,8 +179,8 @@
<!-- BEGIN cat_edit -->
<xsl:template match="cat_edit" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="edit_url" select="edit_url"/>
- <form method="post" action="{$edit_url}">
+ <xsl:variable name="edit_url" select="edit_url"/>
+ <form method="post" action="{$edit_url}">
<table cellpadding="2" cellspacing="2" align="center">
<tr>
<td colspan="3" align="center">
@@ -261,7 +259,7 @@
</input>
</td>
<td>
- <xsl:variable name="lang_apply"
select="lang_apply"/>
+ <xsl:variable name="lang_apply"
select="lang_apply"/>
<input type="submit"
name="values[apply]" value="{$lang_apply}">
<xsl:attribute name="title">
<xsl:value-of
select="lang_apply_statustext"/>
@@ -280,15 +278,15 @@
</td>
</tr>
</table>
- </form>
+ </form>
</xsl:template>
<xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected"
value="selected"/>
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes"
select="name"/>
- </option>
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:template>
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-11-15 19:55:12 UTC (rev
17311)
+++ branches/Version-2_0-branch/bookingfrontend 2017-11-16 07:47:14 UTC (rev
17312)
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,17175-17188,17190-17195,17214
\ 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,17190-17195,17214,17303-17311
\ No newline at end of property
Modified: branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -1593,6 +1593,48 @@
}
}
+ function get_next_start_date($start_date, $repeat_type,
$repeat_interval)
+ {
+ $next_date = $start_date;
+ $now = time();
+ while ($next_date < $now)
+ {
+ $interval_date = $next_date;
+ $return_date = $next_date;
+
+ if ($repeat_type == 0)
+ {
+ $next_date = mktime(0, 0, 0, date("m",
$interval_date), date("d", $interval_date) + $repeat_interval, date("Y",
$interval_date));
+ }
+ else if ($repeat_type == 1)
+ {
+ $next_date = mktime(0, 0, 0, date("m",
$interval_date), date("d", $interval_date) + ($repeat_interval * 7), date("Y",
$interval_date));
+ }
+ else if ($repeat_type == 2)
+ {
+ $month = date("m", $interval_date) +
$repeat_interval;
+ $year = date("Y", $interval_date);
+ if ($month > 12)
+ {
+ $month = $month % 12;
+ $year += 1;
+ }
+
+ $num_days_in_month =
cal_days_in_month(CAL_GREGORIAN, $month, $year);
+ $next_date = mktime(0, 0, 0, $month,
$num_days_in_month, $year);
+ }
+ else if ($repeat_type == 3)
+ {
+ $next_date = mktime(0, 0, 0, date("m",
$interval_date), date("d", $interval_date), date("Y", $interval_date) +
$repeat_interval);
+ }
+
+// $_next_date = date('d/m-Y', $next_date);
+
+ }
+
+ return $return_date;
+ }
+
function add_controll_to_component_from_master(
$master_component, $targets = array() )
{
$master_component_arr = explode('_', $master_component);
@@ -1608,7 +1650,7 @@
. " {$this->db->join} controller_control_serie"
. " ON
controller_control_serie.control_relation_id =
controller_control_component_list.id"
. " AND
controller_control_serie.control_relation_type = 'component'"
- . " WHERE location_id = {$location_id} AND
component_id = {$component_id}";
+ . " WHERE location_id = {$location_id} AND
component_id = {$component_id} AND controller_control_serie.enabled = 1";
$this->db->query($sql, __LINE__, __FILE__);
@@ -1615,17 +1657,18 @@
$series = array();
while ($this->db->next_record())
{
- $start_date = $this->db->f('start_date');
- if ($start_date < time())
- {
- $start_date = time();
- }
+ $_start_date = $this->db->f('start_date');
+ $repeat_type = $this->db->f('repeat_type');
+ $repeat_interval =
$this->db->f('repeat_interval');
+
+ $start_date =
$this->get_next_start_date($_start_date, $repeat_type, $repeat_interval);
+
$series[] = array(
'control_id' =>
$this->db->f('control_id'),
'assigned_to' =>
$this->db->f('assigned_to'),
'start_date' => $start_date,
- 'repeat_type' =>
$this->db->f('repeat_type'),
- 'repeat_interval' =>
$this->db->f('repeat_interval'),
+ 'repeat_type' => $repeat_type,
+ 'repeat_interval' => $repeat_interval,
'service_time' =>
$this->db->f('service_time'),
'controle_time' =>
$this->db->f('controle_time'),
'duplicate' => true
Modified: branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -314,7 +314,7 @@
$filter_component =
phpgw::get_var('location_id', 'int') . '_' . phpgw::get_var('component_id',
'int');
}
$data = array(
- 'datatable_name' => lang('status components'),
+ 'datatable_name' =>
phpgw::get_var('get_locations', 'bool') ? lang('status locations') :
lang('status components'),
'form' => array(
'action' =>
self::link(array('menuaction' => 'controller.uicomponent.index',
'get_locations' =>
phpgw::get_var('get_locations', 'bool'),
@@ -834,16 +834,17 @@
foreach ($controls_at_component as $component)
{
- $_control_relation =
$component->get_control_relation();
+ $control_relation =
$component->get_control_relation();
- if
(!$_control_relation['serie_enabled'])
+ if (!$control_relation['serie_enabled'])
{
//
continue;
}
- $control_id =
$_control_relation['control_id'];
+ $control_id =
$control_relation['control_id'];
$control =
$so_control->get_single($control_id);
- $repeat_type =
$control->get_repeat_type();
+// $repeat_type =
$control->get_repeat_type();
+ $repeat_type =
(int)$control_relation['repeat_type'];
//FIXME: Not currently supported
if ($repeat_type <=
controller_control::REPEAT_TYPE_WEEK)
@@ -888,7 +889,7 @@
/*
* start override control with
data from serie
*/
- $control_relation =
$component->get_control_relation();
+ // $control_relation =
$component->get_control_relation();
if
(isset($control_relation['start_date']) && $control_relation['start_date'])
{
$control->set_start_date($control_relation['start_date']);
Modified:
branches/Version-2_0-branch/controller/inc/component/class.date_generator.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/component/class.date_generator.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++
branches/Version-2_0-branch/controller/inc/component/class.date_generator.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -13,9 +13,19 @@
private $repeat_type;
private $repeat_interval;
private $calendar_array = array();
+ private $deadline_end_of_year;
public function __construct( $start_date, $end_date,
$period_start_date, $period_end_date, $repeat_type, $repeat_interval )
{
+ static $config = array();
+
+ if(!$config)
+ {
+ $config = CreateObject('phpgwapi.config',
'controller')->read();
+ }
+
+ $this->deadline_end_of_year =
empty($config['deadline_end_of_year']) ? false : true;
+
$this->start_date = $start_date;
$this->end_date = $end_date;
$this->period_start_date = $period_start_date;
@@ -109,7 +119,18 @@
// $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
12, date("y", $this->start_date));
$num_days_in_month =
cal_days_in_month(CAL_GREGORIAN, date("m", $this->start_date), date("y",
$this->start_date));
// $control_start_date = mktime(0,0,0, 12,
$num_days_in_month, date("y", $this->start_date));
- $control_start_date = mktime(0, 0, 0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
+ $control_start_year = date('y',
$this->start_date);
+ $period_start_year = date('y',
$this->period_start_date);
+ /**
+ * In order to be able to place the deadline at
the end of the year
+ */
+ if($control_start_year == $period_start_year)
+ {
+ $control_start_year -= 1;
+ }
+
+// $control_start_date = mktime(0, 0, 0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
+ $control_start_date = mktime(0, 0, 0, date("m",
$this->start_date), $num_days_in_month, $control_start_year);
}
return $control_start_date;
@@ -144,8 +165,15 @@
else if ($this->repeat_type == 3)
{
//set end date on year-control to last
day of the year -> 12/31/<year>
-// $trail_period_start_date = mktime(0, 0,
0, date("m", $trail_period_start_date), date("d", $trail_period_start_date),
date("Y", $trail_period_start_date) + $this->repeat_interval);
- $trail_period_start_date = mktime(0, 0,
0, 12, 31, date("Y", $trail_period_start_date) + $this->repeat_interval);
+
+ if($this->deadline_end_of_year)
+ {
+ $trail_period_start_date =
mktime(0, 0, 0, 12, 31, date("Y", $trail_period_start_date) +
$this->repeat_interval);
+ }
+ else
+ {
+ $trail_period_start_date =
mktime(0, 0, 0, date("m", $trail_period_start_date), date("d",
$trail_period_start_date), date("Y", $trail_period_start_date) +
$this->repeat_interval);
+ }
}
}
Modified: branches/Version-2_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/controller/setup/phpgw_no.lang 2017-11-15
19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/controller/setup/phpgw_no.lang 2017-11-16
07:47:14 UTC (rev 17312)
@@ -406,4 +406,5 @@
CONTROL_CANCELED controller no Kontroll kansellert
document types controller no Dokumenttyper
Do not edit archived version controller no Du kan ikke endre
arkiverte versjoner
-choose a location controller no Velg en lokasjon
\ No newline at end of file
+choose a location controller no Velg en lokasjon
+deadline end of year controller no Frist på slutten av året for
årskontroller
\ No newline at end of file
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-11-15 19:55:12 UTC (rev 17311)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-11-16 07:47:14 UTC (rev 17312)
@@ -17,7 +17,7 @@
<form id="frm_update_check_list" action="{$action_url}"
method="post">
<xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
<input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
- <xsl:if test="check_list_locked">
+ <xsl:if test="check_list_locked = '1'">
<div class='input_error_msg'>
<xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
</div>
@@ -148,7 +148,7 @@
</textarea>
</div>
- <xsl:if test="check_list_locked = 'true'">
+ <xsl:if test="check_list_locked != '1'">
<div class="form-buttons">
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_check_list')"
/></xsl:variable>
<input class="btn" type="submit"
name="save_control" value="Lagre detaljer" />
Modified: branches/Version-2_0-branch/controller/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/controller/templates/base/config.tpl
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/controller/templates/base/config.tpl
2017-11-16 07:47:14 UTC (rev 17312)
@@ -52,6 +52,15 @@
</select>
</td>
</tr>
+ <tr class="row_on">
+ <td>{lang_deadline_end_of_year}</td>
+ <td>
+ <select
name="newsettings[deadline_end_of_year]">
+ <option value=""
{selected_deadline_end_of_year_}>{lang_no}</option>
+ <option value="1"
{selected_deadline_end_of_year_1}>{lang_yes}</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_off">
<td>{lang_control_mandatory_location}</td>
<td>
Modified: branches/Version-2_0-branch/helpdesk/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.hook_helper.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/helpdesk/inc/class.hook_helper.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -26,7 +26,7 @@
phpgw::import_class('frontend.bofellesdata');
- class frontend_hook_helper
+ class helpdesk_hook_helper
{
private $config;
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -847,7 +847,7 @@
}
}
- if($subs && $this->parent_cat_id < 0)
+ if($subs && (int)$this->parent_cat_id <= 0)
{
$GLOBALS['phpgw_info']['flags']['app_header'] =
$this->lang_app_name . ': ' . lang('choose a section from the menu');
self::render_template_xsl('datatable_jquery',
array());
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-11-15
19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-11-16
07:47:14 UTC (rev 17312)
@@ -220,4 +220,4 @@
ticket is forwarded helpdesk no Melding er videresendt
email_create_account_title helpdesk no LRS systemtilgang
email_create_account_message helpdesk no Systemmelding fra LRS
til %1 %2:<br/>Det er opprettet en tilgang for deg i LRS<br/><br/>Du får
tilgang til systemet via kommunens intranett.<br/>Under verktøy i høyre
kolonne, velg fra LRS listen.<br/>Brukerveiledning finner du i systemet, ved å
velge "Hjelp" i toppmenyen.<br/>Har du spørsmål send en e-post til LRS
brukerstøtte.<br/>
-choose a section from the menu helpdesk no Velg en seksjon fra
menyen
\ No newline at end of file
+choose a section from the menu helpdesk no Velg en avdeling fra
menyen
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.categories.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.categories.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.categories.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -25,6 +25,7 @@
var $db;
var $total_records;
var $grants;
+ var $like;
protected $location;
protected $location_id;
/**
@@ -48,7 +49,8 @@
}
$this->account_id = (int) $account_id;
- $this->db =&
$GLOBALS['phpgw']->db;
+ $this->db = &
$GLOBALS['phpgw']->db;
+ $this->like = & $this->db->like;
$this->set_appname($app_name, $location);
}
@@ -203,7 +205,7 @@
$querymethod = '';
if ($query)
{
- $querymethod = " AND (cat_name LIKE '%$query%'
OR cat_description LIKE '%$query%') ";
+ $querymethod = " AND (cat_name {$this->like}
'%$query%' OR cat_description {$this->like} '%$query%') ";
}
if($lastmod && $lastmod >= 0)
@@ -347,7 +349,7 @@
$querymethod = '';
if ($query)
{
- $querymethod = " AND (cat_name LIKE '%$query%'
OR cat_description LIKE '%$query%') ";
+ $querymethod = " AND (cat_name {$this->like}
'%$query%' OR cat_description {$this->like} '%$query%') ";
}
$filter_location = '';
@@ -356,9 +358,9 @@
$filter_location = "AND location_id =
{$this->location_id}";
}
- $sql = "SELECT * FROM phpgw_categories WHERE
(cat_appname='{$this->app_name}' {$filter_location} AND $grant_cats
$global_cats) $querymethod";
+ $sql = "SELECT * FROM phpgw_categories WHERE
(cat_appname='{$this->app_name}' {$filter_location} AND $grant_cats
$global_cats)";
- $this->db->query($sql . $parent_select .
$ordermethod,__LINE__,__FILE__);
+ $this->db->query($sql . $querymethod . $parent_select .
$ordermethod,__LINE__,__FILE__);
$total = $this->db->num_rows();
$_cats = array();
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.nextmatchs_xslt.inc.php
2017-11-16 07:47:14 UTC (rev 17312)
@@ -127,7 +127,7 @@
'right_grey_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','right-grey'),
'last_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','last'),
'last_grey_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','last-grey'),
- 'all_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','down_nm'),
+ 'all_img' =>
$GLOBALS['phpgw']->common->image('phpgwapi','down'),
'title_first' => lang('first page'),
'title_previous' => lang('previous
page'),
'title_next' => lang('next page'),
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-11-15
19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-11-16
07:47:14 UTC (rev 17312)
@@ -547,9 +547,12 @@
else if (phpgw::get_var('domain', 'string', 'REQUEST', false))
{
// on "normal" pageview
- if(!$GLOBALS['phpgw_info']['user']['domain'] =
phpgw::get_var('domain', 'string', 'REQUEST', false))
+ if(!$GLOBALS['phpgw_info']['user']['domain'] =
phpgw::get_var('domain', 'string', 'GET', false))
{
- $GLOBALS['phpgw_info']['user']['domain'] =
phpgw::get_var('domain', 'string', 'COOKIE', false);
+ if(!$GLOBALS['phpgw_info']['user']['domain'] =
phpgw::get_var('domain', 'string', 'POST', false))
+ {
+ $GLOBALS['phpgw_info']['user']['domain'] =
phpgw::get_var('domain', 'string', 'COOKIE', false);
+ }
}
}
else
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/search_field.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/search_field.xsl
2017-11-15 19:55:12 UTC (rev 17311)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/search_field.xsl
2017-11-16 07:47:14 UTC (rev 17312)
@@ -1,28 +1,30 @@
<!-- $Id$ -->
- <xsl:template name="search_field">
- <xsl:apply-templates select="search_data"/>
- </xsl:template>
+<xsl:template name="search_field">
+ <xsl:apply-templates select="search_data"/>
+</xsl:template>
- <xsl:template match="search_data">
- <xsl:variable name="select_url"><xsl:value-of
select="select_url"/></xsl:variable>
- <xsl:variable name="query"><xsl:value-of
select="query"/></xsl:variable>
- <xsl:variable name="lang_search"><xsl:value-of
select="lang_search"/></xsl:variable>
- <form method="post" action="{$select_url}">
- <input type="text" name="query"
value="{$query}" onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_searchfield_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <xsl:text> </xsl:text>
- <input type="submit" name="submit"
value="{$lang_search}" onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_searchbutton_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </xsl:template>
+<xsl:template match="search_data">
+ <xsl:variable name="select_url">
+ <xsl:value-of select="select_url"/>
+ </xsl:variable>
+ <xsl:variable name="query">
+ <xsl:value-of select="query"/>
+ </xsl:variable>
+ <xsl:variable name="lang_search">
+ <xsl:value-of select="lang_search"/>
+ </xsl:variable>
+ <form method="post" action="{$select_url}">
+ <input type="text" name="query" value="{$query}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_searchfield_statustext"/>
+ </xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <input type="submit" name="submit" value="{$lang_search}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_searchbutton_statustext"/>
+ </xsl:attribute>
+ </input>
+ </form>
+</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17312] Stable: Merge 17302:17311 from trunk,
sigurdne <=