[Fmsystem-commits] [14905] Merge 14903:14904 from trunk

[Sigurd Nes]

Revision: 14905
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14905
Author:   sigurdne
Date:     2016-04-07 08:44:20 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Merge 14903:14904 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/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
   + /branches/dev-syncromind:13653
/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

Modified: 
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl    
2016-04-07 08:43:16 UTC (rev 14904)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl    
2016-04-07 08:44:20 UTC (rev 14905)
@@ -922,6 +922,25 @@
                        */
                        var table_url = 
JqueryPortico.parseURL(window.location.href);
                        var menuaction = 
table_url.searchObject.menuaction.replace(/\./g, '_');
+
+                       //uiocation
+                       if(typeof(table_url.searchObject.type_id) != 
'undefined')
+                       {
+                               menuaction += '_type_id' + 
table_url.searchObject.type_id;
+                       }
+
+                       //uientity
+                       if(typeof(table_url.searchObject.entity_id) != 
'undefined' && typeof(table_url.searchObject.cat_id) != 'undefined')
+                       {
+                               menuaction += '_entity_id' + 
table_url.searchObject.entity_id + '_cat_id' + table_url.searchObject.cat_id;
+                       }
+
+                       //uigeneric
+                       if(typeof(table_url.searchObject.type) != 'undefined' 
&& menuaction.search("uigeneric") > 0)
+                       {
+                               menuaction += '_type_' + 
table_url.searchObject.type;
+                       }
+
                        /*
                         * Find and assign actions to filters
                         */