From ab01cd95696939f6d4ad5f0346544b733f28ba8f Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 13 Oct 2017 06:47:20 +0200 Subject: [PATCH] LoginView.js - remove realm selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because it is not really required. Instead, we always use realm 'pmg' to login toƶ the admin interface. The backend can map 'root@pmg' to 'root@pam'. --- js/LoginView.js | 48 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/js/LoginView.js b/js/LoginView.js index 07cfaa6..7de8082 100644 --- a/js/LoginView.js +++ b/js/LoginView.js @@ -1,27 +1,3 @@ -/*global Proxmox*/ -Ext.define('PMG.form.RealmComboBox', { - extend: 'Proxmox.form.KVComboBox', - xtype: 'pmgRealmComboBox', - - getState: function() { - return { value: this.getValue() }; - }, - applyState : function(state) { - if (state && state.value) { - this.setValue(state.value); - } - }, - stateEvents: [ 'select' ], - stateful: true, // last chosen auth realm is saved between page reloads - id: 'pmgloginrealm', // We need stable ids when using stateful, not autogenerated - stateID: 'pmgloginrealm', - - comboItems: [ - ['pam', 'Local System (PAM)'], - ['pmg', 'Proxmox Mail Gateway'] - ] -}); - Ext.define('PMG.LoginView', { extend: 'Ext.container.Container', xtype: 'loginview', @@ -35,15 +11,14 @@ Ext.define('PMG.LoginView', { var realmfield = me.lookup('realmfield'); - if (view.targetview === 'quarantineview') { - realmfield.setDisabled(true); - realmfield.setVisible(false); - } + if (view.targetview !== 'quarantineview') return; - var loginForm = this.lookupReference('loginForm'); + realmfield.setValue('quarantine'); // try autologin with quarantine ticket from URL + var loginForm = this.lookupReference('loginForm'); + var qs = Ext.Object.fromQueryString(location.search); if (qs.ticket == undefined) { return; } var ticket = decodeURIComponent(qs.ticket); @@ -179,20 +154,19 @@ Ext.define('PMG.LoginView', { name: 'password', reference: 'passwordField' }, - { - xtype: 'pmgRealmComboBox', - fieldLabel: gettext('Realm'), - reference: 'realmfield', - name: 'realm', - value: 'pam' - }, { xtype: 'proxmoxLanguageSelector', fieldLabel: gettext('Language'), value: Ext.util.Cookies.get('PMGLangCookie') || 'en', name: 'lang', submitValue: false - } + }, + { + xtype: 'hiddenfield', + reference: 'realmfield', + name: 'realm', + value: 'pmg' + } ], buttons: [ {