merge with branch issue-94

This commit is contained in:
Sebastian Sdorra
2012-02-09 08:16:28 +01:00

View File

@@ -62,14 +62,14 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{
fieldLabel: this.displayNameText,
name: 'displayName',
allowBlank: false,
readOnly: this.item != null && this.item != 'xml',
readOnly: this.isReadOnly(),
helpText: this.displayNameHelpText
},{
fieldLabel: this.mailText,
name: 'mail',
allowBlank: true,
vtype: 'email',
readOnly: this.item != null && this.item != 'xml',
readOnly: this.isReadOnly(),
helpText: this.mailHelpText
}];
@@ -105,6 +105,10 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{
Ext.apply(this, Ext.apply(this.initialConfig, {items: items}));
Sonia.user.FormPanel.superclass.initComponent.apply(this, arguments);
},
isReadOnly: function(){
return this.item != null && this.item.type != 'xml';
},
fixRequest: function(user){
delete user['password-confirm'];