[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12030] modify javascript path
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12030] modify javascript path |
|
Date: |
Fri, 27 Jun 2014 11:12:27 +0000 |
Revision: 12030
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12030
Author: sigurdne
Date: 2014-06-27 11:12:25 +0000 (Fri, 27 Jun 2014)
Log Message:
-----------
modify javascript path
Modified Paths:
--------------
trunk/property/inc/class.uiadmin_entity.inc.php
trunk/property/inc/class.uiadmin_location.inc.php
trunk/property/inc/class.uiagreement.inc.php
trunk/property/inc/class.uialarm.inc.php
trunk/property/inc/class.uiasync.inc.php
trunk/property/inc/class.uibudget.inc.php
trunk/property/inc/class.uicustom.inc.php
trunk/property/inc/class.uidocument.inc.php
trunk/property/inc/class.uievent.inc.php
trunk/property/inc/class.uigab.inc.php
trunk/property/inc/class.uigallery.inc.php
trunk/property/inc/class.uiinvestment.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/inc/class.uijasper.inc.php
trunk/property/inc/class.uipricebook.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/inc/class.uiresponsible.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/inc/class.uitemplate.inc.php
trunk/property/inc/class.uitenant_claim.inc.php
Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uiadmin_entity.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -318,8 +318,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -751,8 +759,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -1605,8 +1621,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -2019,8 +2043,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -2743,8 +2775,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uiadmin_location.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_location.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uiadmin_location.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -349,8 +349,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -857,8 +865,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -1339,8 +1355,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uiagreement.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -501,8 +501,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uialarm.inc.php
===================================================================
--- trunk/property/inc/class.uialarm.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uialarm.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -370,8 +370,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -718,8 +726,16 @@
//die(_debug_array($datatable['headers']));
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uiasync.inc.php
===================================================================
--- trunk/property/inc/class.uiasync.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uiasync.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -374,8 +374,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uibudget.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -444,8 +444,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -872,8 +880,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -1393,8 +1409,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uicustom.inc.php
===================================================================
--- trunk/property/inc/class.uicustom.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uicustom.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -314,8 +314,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -689,8 +697,16 @@
);
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uidocument.inc.php
===================================================================
--- trunk/property/inc/class.uidocument.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uidocument.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -927,8 +927,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uievent.inc.php
===================================================================
--- trunk/property/inc/class.uievent.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uievent.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -515,8 +515,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uigab.inc.php
===================================================================
--- trunk/property/inc/class.uigab.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uigab.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -654,8 +654,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -996,8 +1004,16 @@
$info[4]['value'] = lang($gab_list[0]['owner']);
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uigallery.inc.php
===================================================================
--- trunk/property/inc/class.uigallery.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uigallery.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -648,8 +648,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uiinvestment.inc.php
===================================================================
--- trunk/property/inc/class.uiinvestment.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uiinvestment.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -444,8 +444,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -845,8 +853,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uiinvoice.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -1463,8 +1463,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -2145,8 +2153,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
count($content);
@@ -2980,8 +2996,16 @@
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uijasper.inc.php
===================================================================
--- trunk/property/inc/class.uijasper.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uijasper.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -377,8 +377,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uipricebook.inc.php
===================================================================
--- trunk/property/inc/class.uipricebook.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uipricebook.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -541,8 +541,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -1286,8 +1294,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uirequest.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -882,8 +882,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uiresponsible.inc.php
===================================================================
--- trunk/property/inc/class.uiresponsible.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uiresponsible.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -496,8 +496,16 @@
}
// path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uis_agreement.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -540,8 +540,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uitemplate.inc.php
===================================================================
--- trunk/property/inc/class.uitemplate.inc.php 2014-06-27 10:32:14 UTC (rev
12029)
+++ trunk/property/inc/class.uitemplate.inc.php 2014-06-27 11:12:25 UTC (rev
12030)
@@ -413,8 +413,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Modified: trunk/property/inc/class.uitenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.uitenant_claim.inc.php 2014-06-27 10:32:14 UTC
(rev 12029)
+++ trunk/property/inc/class.uitenant_claim.inc.php 2014-06-27 11:12:25 UTC
(rev 12030)
@@ -477,8 +477,16 @@
}
//path for property.js
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
+ $property_js = "/property/js/yahoo/property.js";
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
// Pagination and sort values
$datatable['pagination']['records_start'] =
(int)$this->bo->start;
$datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12030] modify javascript path,
Sigurd Nes <=