[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15265] Stable: Merge 15262:15264 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15265] Stable: Merge 15262:15264 from trunk |
|
Date: |
Tue, 7 Jun 2016 11:13:52 +0000 (UTC) |
Revision: 15265
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15265
Author: sigurdne
Date: 2016-06-07 11:13:51 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
Stable: Merge 15262:15264 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-2_0-branch/logistic/js/logistic/requirement_overview.js
branches/Version-2_0-branch/logistic/js/logistic/resource_allocation.js
branches/Version-2_0-branch/logistic/templates/base/allocation/book_resources.xsl
branches/Version-2_0-branch/logistic/templates/base/css/base.css
branches/Version-2_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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
+ /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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
Modified: branches/Version-2_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-2_0-branch/logistic/inc/class.uiactivity.inc.php
2016-06-07 11:12:45 UTC (rev 15264)
+++ branches/Version-2_0-branch/logistic/inc/class.uiactivity.inc.php
2016-06-07 11:13:51 UTC (rev 15265)
@@ -670,7 +670,7 @@
$datatable_def[] = array
(
- 'container' => 'requirement-container',
+ 'container' => 'requirement-container_0',
'requestUrl' =>
json_encode(self::link(array('menuaction' => 'logistic.uirequirement.index',
'activity_id' => $activity_id,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $ColumnDefs0,
@@ -698,7 +698,7 @@
$datatable_def[] = array
(
- 'container' => 'allocation-container',
+ 'container' => 'allocation-container_0',
'requestUrl' => "''",
//json_encode(self::link(array('menuaction' =>
'logistic.uirequirement_resource_allocation.index', 'requirement_id' =>
$requirement_id, 'type' => "requirement_id", 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $ColumnDefs1,
'data' => json_encode(array()),
Modified:
branches/Version-2_0-branch/logistic/js/logistic/requirement_overview.js
===================================================================
--- branches/Version-2_0-branch/logistic/js/logistic/requirement_overview.js
2016-06-07 11:12:45 UTC (rev 15264)
+++ branches/Version-2_0-branch/logistic/js/logistic/requirement_overview.js
2016-06-07 11:13:51 UTC (rev 15265)
@@ -30,7 +30,7 @@
var callback = function (result)
{
-
JqueryPortico.updateinlineTableHelper('requirement-container');
+
JqueryPortico.updateinlineTableHelper('requirement-container_0');
};
JqueryPortico.execute_ajax(requestUrl, callback, {}, 'POST',
'json');
}
@@ -61,8 +61,8 @@
var requestUrl2 =
phpGWLink('index.php', oArgs2, true);
-
JqueryPortico.updateinlineTableHelper('allocation-container', requestUrl2);
-
JqueryPortico.updateinlineTableHelper('requirement-container');
+
JqueryPortico.updateinlineTableHelper('allocation-container_0', requestUrl2);
+
JqueryPortico.updateinlineTableHelper('requirement-container_0');
}
},
error: function (XMLHttpRequest, textStatus,
errorThrown)
@@ -120,7 +120,7 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper('requirement-container',
requestUrl);
+ JqueryPortico.updateinlineTableHelper('requirement-container_0',
requestUrl);
}
@@ -134,6 +134,6 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper(oTable1, requestUrl);
+ JqueryPortico.updateinlineTableHelper('requirement-container_0',
requestUrl);
}
Modified:
branches/Version-2_0-branch/logistic/js/logistic/resource_allocation.js
===================================================================
--- branches/Version-2_0-branch/logistic/js/logistic/resource_allocation.js
2016-06-07 11:12:45 UTC (rev 15264)
+++ branches/Version-2_0-branch/logistic/js/logistic/resource_allocation.js
2016-06-07 11:13:51 UTC (rev 15265)
@@ -1,7 +1,7 @@
$(document).ready(function ()
{
- $("#requirement-container tr").on("click", function (e)
+ $("#requirement-container_0 tr").on("click", function (e)
{
var requirement_id = $('td', this).eq(0).text();
updateAllocationTable(requirement_id);
@@ -23,5 +23,5 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper('allocation-container',
requestUrl);
+ JqueryPortico.updateinlineTableHelper('allocation-container_0',
requestUrl);
}
Modified:
branches/Version-2_0-branch/logistic/templates/base/allocation/book_resources.xsl
===================================================================
---
branches/Version-2_0-branch/logistic/templates/base/allocation/book_resources.xsl
2016-06-07 11:12:45 UTC (rev 15264)
+++
branches/Version-2_0-branch/logistic/templates/base/allocation/book_resources.xsl
2016-06-07 11:13:51 UTC (rev 15265)
@@ -158,5 +158,4 @@
</form>
</div>
</div>
-<xsl:call-template name="jquery_phpgw_i18n"/>
</xsl:template>
Modified: branches/Version-2_0-branch/logistic/templates/base/css/base.css
===================================================================
--- branches/Version-2_0-branch/logistic/templates/base/css/base.css
2016-06-07 11:12:45 UTC (rev 15264)
+++ branches/Version-2_0-branch/logistic/templates/base/css/base.css
2016-06-07 11:13:51 UTC (rev 15265)
@@ -763,7 +763,7 @@
padding: 20px;
}
-#datatable-container {
+#datatable-container_0 {
margin: 20px;
}
@@ -1971,7 +1971,7 @@
float: left;
}
-#choose-location #datatable-container{
+#choose-location #datatable-container_0{
margin: 20px 0;
}
@@ -2369,7 +2369,7 @@
margin-top: 0;
}
-#requirement-container .btn-sm {
+#requirement-container_0 .btn-sm {
border-color: #4378B1 #2663A3 #366CA4;
font-size: 12px;
padding: 1px 8px;
@@ -2380,7 +2380,7 @@
padding: 0;
}
-#requirement-container table td{
+#requirement-container_0 table td{
padding: 5px 0;
}
@@ -2398,7 +2398,7 @@
}
-#allocation-container .yui-dt-col-delete_link .yui-dt-liner {
+#allocation-container_0 .yui-dt-col-delete_link .yui-dt-liner {
text-align: center;
}
@@ -2417,11 +2417,11 @@
width: 136px;
}
-#sub-activities-container th div, #requirement-container th div {
+#sub-activities-container th div, #requirement-container_0 th div {
/*background: #6292C5;*/
}
-#sub-activities-container .yui-dt table, #requirement-container .yui-dt table {
+#sub-activities-container .yui-dt table, #requirement-container_0 .yui-dt
table {
/*border: 1px solid #98BFE8;*/
}
@@ -2429,14 +2429,14 @@
width: 800px;
}
-#requirement-container .yui-dt table, #allocation-container .yui-dt table {
+#requirement-container_0 .yui-dt table, #allocation-container_0 .yui-dt table {
width: 1000px;
}
#sub-activities-container th a, #sub-activities-container th span,
-#requirement-container th a, #requirement-container th span,
-#allocation-container th a, #allocation-container th span,
-#datatable-container th a, #datatable-container th span
+#requirement-container_0 th a, #requirement-container_0 th span,
+#allocation-container_0 th a, #allocation-container_0 th span,
+#datatable-container_0 th a, #datatable-container_0 th span
{
/*color: #F9FCFE;*/
font-weight: bold;
@@ -2465,6 +2465,6 @@
text-decoration: underline;
}
-#requirement-container .btn-sm.cancel {
+#requirement-container_0 .btn-sm.cancel {
border: 1px solid #CCCCCC;
}
Modified:
branches/Version-2_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
---
branches/Version-2_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2016-06-07 11:12:45 UTC (rev 15264)
+++
branches/Version-2_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2016-06-07 11:13:51 UTC (rev 15265)
@@ -27,7 +27,7 @@
<div style="clear:both;" id="paging"></div>
<div style="margin-bottom: 40px;">
<xsl:for-each select="datatable_def">
- <xsl:if test="container =
'requirement-container'">
+ <xsl:if test="container =
'requirement-container_0'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
<xsl:with-param
name="requestUrl" select ='requestUrl' />
@@ -46,7 +46,7 @@
<!-- // Needed for case of only one checkbox in
datatable-->
<input type='hidden' name='assign_requirement'
value = '0'/>
<xsl:for-each select="datatable_def">
- <xsl:if test="container =
'allocation-container'">
+ <xsl:if test="container =
'allocation-container_0'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
<xsl:with-param
name="requestUrl" select ='requestUrl' />
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-06-07
11:12:45 UTC (rev 15264)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-06-07
11:13:51 UTC (rev 15265)
@@ -381,14 +381,21 @@
ajax: ajax_def,
fnServerParams: function (aoData)
{
- if (!$.isEmptyObject(eval('paramsTable' +
container.substr(container.length -1, 1))))
- {
- $.each(eval('paramsTable' +
container.substr(container.length -1, 1)), function (k, v)
+ try
+ {
+ if (!$.isEmptyObject(eval('paramsTable' +
container.substr(container.length -1, 1))))
{
- aoData[k] = v;
- });
+ $.each(eval('paramsTable' +
container.substr(container.length -1, 1)), function (k, v)
+ {
+ aoData[k] = v;
+ });
+ }
}
+ catch (err)
+ {
+ }
+
if (typeof (aoData.order) != 'undefined')
{
var column = aoData.order[0].column;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15265] Stable: Merge 15262:15264 from trunk,
sigurdne <=