[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6960] Merge 6957:6959 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6960] Merge 6957:6959 from trunk |
Date: |
Thu, 10 Feb 2011 08:08:29 +0000 |
Revision: 6960
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6960
Author: sigurdne
Date: 2011-02-10 08:08:28 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Merge 6957:6959 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/phpgwapi/templates/portico/js/base.js
branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/templates/portico/images/folder.png
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2011-02-09 17:56:58 UTC (rev 6959)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2011-02-10 08:08:28 UTC (rev 6960)
@@ -76,6 +76,8 @@
*/
protected $_total_records = 0;
+ protected $global_lock = false;
+
/**
* Constructor
*
@@ -318,7 +320,14 @@
unset($attrib);
- $this->_db->transaction_begin();
+ if ( $this->_db->Transaction )
+ {
+ $this->global_lock = true;
+ }
+ else
+ {
+ $this->_db->transaction_begin();
+ }
$sql = "SELECT id FROM phpgw_cust_attribute"
. " WHERE location_id =
{$values['location_id']}"
@@ -385,9 +394,12 @@
$this->_oProc->AddColumn($attrib_table,
$values['column_name'], $col_info);
- if ( $this->_db->transaction_commit() )
+ if ( !$this->global_lock )
{
- return $values['id'];
+ if ( $this->_db->transaction_commit() )
+ {
+ return $values['id'];
+ }
}
return 0;
Copied:
branches/Version-1_0-branch/phpgwapi/templates/portico/images/folder.png (from
rev 6959, trunk/phpgwapi/templates/portico/images/folder.png)
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/phpgwapi/templates/portico/js/base.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/portico/js/base.js
2011-02-09 17:56:58 UTC (rev 6959)
+++ branches/Version-1_0-branch/phpgwapi/templates/portico/js/base.js
2011-02-10 08:08:28 UTC (rev 6960)
@@ -180,8 +180,7 @@
minHeight: 400,
units: [
{ position: 'top', body: layout['north'],
height: 26 },
- // { position: 'left', header: this.getHeader(
layout['west'] ), body: layout['west'], width: this.config.unitLeftWidth,
resize: true, scroll: true, gutter: "5px", collapse: false, maxWidth: 300,
minWidth: 6 },
- { position: 'left', header: this.getHeader(
layout['west'] ), body: layout['west'], width: this.config.unitLeftWidth,
resize: true, scroll: true, gutter: "5px", collapse: false , maxWidth: 300,
minWidth: 6 },
+ { position: 'left', header: this.getHeader(
layout['west'] ), body: layout['west'], width: this.config.unitLeftWidth,
resize: true, scroll: true, gutter: "5px", collapse: false, maxWidth: 300,
minWidth: 6 },
{ position: 'center', header: this.getHeader( layout['center']
), body: layout['center'], scroll: true, gutter: "5px 0px" },
// Uncomment for make use of east-layout
// { position: 'right', header: this.getHeader( layout['east']
), body: layout['east'], width: this.config.unitRightWidth, resize: true,
scroll: true, gutter: "5px", collapse: false, maxWidth: 300, minWidth: 6 },
Modified: branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
2011-02-09 17:56:58 UTC (rev 6959)
+++ branches/Version-1_0-branch/phpgwapi/templates/portico/navbar.inc.php
2011-02-10 08:08:28 UTC (rev 6960)
@@ -178,7 +178,12 @@
{
if(!isset($images[$item['image'][0]][$item['image'][1]]))
{
- $icon_style = ' style="background-image: url('
. $GLOBALS['phpgw']->common->image($item['image'][0], $item['image'][1]) . ')"';
+ $icon =
$GLOBALS['phpgw']->common->image($item['image'][0], $item['image'][1]);
+ if(!$icon)
+ {
+ $icon =
$GLOBALS['phpgw']->common->image('phpgwapi', 'folder');
+ }
+ $icon_style = ' style="background-image: url('
. $icon . ')"';
$images[$item['image'][0]][$item['image'][1]] =
$icon_style;
}
else
@@ -186,6 +191,12 @@
$icon_style =
$images[$item['image'][0]][$item['image'][1]];
}
}
+ else
+ {
+ $icon = $GLOBALS['phpgw']->common->image('phpgwapi',
'folder');
+ $icon_style = ' style="background-image: url(' . $icon
. ')"';
+ $images[$item['image'][0]][$item['image'][1]] =
$icon_style;
+ }
if ( $children )
{
$expand_class = item_expanded($id) ? '
class="expanded"' : ' class="collapsed"';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6960] Merge 6957:6959 from trunk,
Sigurd Nes <=