[Fmsystem-commits] [13411] common.js

[Saul]

Revision: 13411
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13411
Author:   psaul
Date:     2015-06-10 22:53:06 +0000 (Wed, 10 Jun 2015)
Log Message:
-----------
common.js

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/js/jquery/common.js

Modified: branches/dev-syncromind/phpgwapi/js/jquery/common.js
===================================================================
--- branches/dev-syncromind/phpgwapi/js/jquery/common.js        2015-06-10 
22:52:45 UTC (rev 13410)
+++ branches/dev-syncromind/phpgwapi/js/jquery/common.js        2015-06-10 
22:53:06 UTC (rev 13411)
@@ -46,23 +46,28 @@
  }
 
 JqueryPortico.formatLinkGeneric = function(key, oData) {
+        
        if(!oData[key])
        {
                return '';
        }
+        
        var data = oData[key];
 
-       if ( typeof(data) == 'object')
+        if( key == 'actions' )
+        {
+                var link = data;
+                var name = 'Delete';
+        }
+       else if ( typeof(data) == 'object')
        {
                var link = data['href'];
                var name = data['label'];
-
        }
-       else
+        else
        {
                var name = 'Link';
                var link = data;
-
        }
 
        return '<a href="' + link + '">' + name + '</a>';