[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9210] frontend: sync with property
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [9210] frontend: sync with property |
Date: |
Mon, 23 Apr 2012 14:26:37 +0000 |
Revision: 9210
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9210
Author: sigurdne
Date: 2012-04-23 14:26:36 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
frontend: sync with property
Modified Paths:
--------------
trunk/frontend/inc/class.uientity.inc.php
trunk/frontend/js/yahoo/entity.list.js
Modified: trunk/frontend/inc/class.uientity.inc.php
===================================================================
--- trunk/frontend/inc/class.uientity.inc.php 2012-04-23 12:55:21 UTC (rev
9209)
+++ trunk/frontend/inc/class.uientity.inc.php 2012-04-23 14:26:36 UTC (rev
9210)
@@ -322,6 +322,9 @@
$code_inner[] = "{order:0,
var_URL:'criteria_id',name:'btn_criteria_id',style:'genericbutton',dependiente:[]}";
*/
+ $button_def = array();
+ $code_inner = array();
+
if($attrib_data)
{
$i = 0;
@@ -368,9 +371,15 @@
}
}
- $code = 'var ' . implode(',', $button_def) .
";\n";
- $code .= 'var selectsButtons = [' . "\n" .
implode(",\n",$code_inner) . "\n];";
-
+ if($button_def)
+ {
+ $code = 'var ' . implode(',',
$button_def) . ";\n";
+ $code .= 'var selectsButtons = [' .
"\n" . implode(",\n",$code_inner) . "\n];";
+ }
+ else
+ {
+ $code .= 'var selectsButtons = [];';
+ }
$GLOBALS['phpgw']->js->add_code('', $code);
// eliminates those empty filters
@@ -472,6 +481,7 @@
{
case 'num':
case 'loc1':
+ case 'loc2':
case 'loc1_name':
$uicols['input_type'][$i] = 'hidden';
break;
Modified: trunk/frontend/js/yahoo/entity.list.js
===================================================================
--- trunk/frontend/js/yahoo/entity.list.js 2012-04-23 12:55:21 UTC (rev
9209)
+++ trunk/frontend/js/yahoo/entity.list.js 2012-04-23 14:26:36 UTC (rev
9210)
@@ -96,6 +96,15 @@
//don't delete it
}
+ var oArgs_entity = {menuaction:'property.uientity.edit'};
+ var sUrl_entity = phpGWLink('index.php', oArgs_entity);
+
+ var linktToEntity = function(elCell, oRecord, oColumn, oData)
+ {
+// elCell.innerHTML = "<a
href="+sUrl_entity+"&entity_id="+oRecord.getData('entity_id')+"&cat_id="+oRecord.getData('cat_id')+"&id="+oRecord.getData('id')+"&type="+oRecord.getData('_type')+">"
+ oData + "</a>";
+ };
+
+
/****************************************************************************************/
YAHOO.util.Event.addListener(window, "load", function()
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9210] frontend: sync with property,
Sigurd Nes <=