Merge remote branch 'upstream/master' into BUG-10852

2013-04-18 11:46:57 -04:00
parent 8b162cda9d 255f48ce02
commit c903dfd1d9
7 changed files with 57 additions and 11 deletions
--- a/workflow/engine/templates/users/users.js
+++ b/workflow/engine/templates/users/users.js
@@ -421,6 +421,7 @@ Ext.onReady(function () {
        xtype      : 'textfield',
        width      : 260,
        allowBlank : false,
+        hidden     : (typeof EDITPROFILE != "undefined" && EDITPROFILE == 1)? true : false,
        listeners: {
          blur : function(ob)
          {