fix #3058: ui: improve remote edit UX by clarifying ID vs host
also fixup missing emptyText for fingerprint (adapted from PVE's PBS storage addition) and code-style in surrounding areas a bit Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
64c075b6c2
commit
2e02a859cf
|
@ -116,7 +116,7 @@ Ext.define('PBS.config.RemoteView', {
|
||||||
|
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
header: gettext('Remote'),
|
header: gettext('Remote ID'),
|
||||||
width: 200,
|
width: 200,
|
||||||
sortable: true,
|
sortable: true,
|
||||||
renderer: Ext.String.htmlEncode,
|
renderer: Ext.String.htmlEncode,
|
||||||
|
|
|
@ -196,7 +196,7 @@ Ext.define('PBS.config.SyncJobView', {
|
||||||
sortable: true,
|
sortable: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
header: gettext('Remote'),
|
header: gettext('Remote ID'),
|
||||||
dataIndex: 'remote',
|
dataIndex: 'remote',
|
||||||
width: 120,
|
width: 120,
|
||||||
sortable: true,
|
sortable: true,
|
||||||
|
|
|
@ -16,7 +16,7 @@ Ext.define('PBS.form.RemoteSelector', {
|
||||||
listConfig: {
|
listConfig: {
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
header: gettext('Remote'),
|
header: gettext('Remote ID'),
|
||||||
sortable: true,
|
sortable: true,
|
||||||
dataIndex: 'name',
|
dataIndex: 'name',
|
||||||
renderer: Ext.String.htmlEncode,
|
renderer: Ext.String.htmlEncode,
|
||||||
|
|
|
@ -32,7 +32,7 @@ Ext.define('PBS.window.RemoteEdit', {
|
||||||
{
|
{
|
||||||
xtype: 'pmxDisplayEditField',
|
xtype: 'pmxDisplayEditField',
|
||||||
name: 'name',
|
name: 'name',
|
||||||
fieldLabel: gettext('Remote'),
|
fieldLabel: gettext('Remote ID'),
|
||||||
renderer: Ext.htmlEncode,
|
renderer: Ext.htmlEncode,
|
||||||
allowBlank: false,
|
allowBlank: false,
|
||||||
minLength: 4,
|
minLength: 4,
|
||||||
|
@ -47,6 +47,7 @@ Ext.define('PBS.window.RemoteEdit', {
|
||||||
submitValue: false,
|
submitValue: false,
|
||||||
vtype: 'HostPort',
|
vtype: 'HostPort',
|
||||||
fieldLabel: gettext('Host'),
|
fieldLabel: gettext('Host'),
|
||||||
|
emptyText: gettext('FQDN or IP-address'),
|
||||||
listeners: {
|
listeners: {
|
||||||
change: function(field, newvalue) {
|
change: function(field, newvalue) {
|
||||||
let host = newvalue;
|
let host = newvalue;
|
||||||
|
@ -74,31 +75,31 @@ Ext.define('PBS.window.RemoteEdit', {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
xtype: 'proxmoxtextfield',
|
xtype: 'proxmoxtextfield',
|
||||||
hidden: true,
|
|
||||||
name: 'host',
|
name: 'host',
|
||||||
|
hidden: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
xtype: 'proxmoxtextfield',
|
xtype: 'proxmoxtextfield',
|
||||||
|
name: 'port',
|
||||||
hidden: true,
|
hidden: true,
|
||||||
cbind: {
|
cbind: {
|
||||||
deleteEmpty: '{!isCreate}',
|
deleteEmpty: '{!isCreate}',
|
||||||
},
|
},
|
||||||
name: 'port',
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
column2: [
|
column2: [
|
||||||
{
|
{
|
||||||
xtype: 'proxmoxtextfield',
|
xtype: 'proxmoxtextfield',
|
||||||
allowBlank: false,
|
|
||||||
name: 'auth-id',
|
name: 'auth-id',
|
||||||
fieldLabel: gettext('Auth ID'),
|
fieldLabel: gettext('Auth ID'),
|
||||||
|
allowBlank: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
xtype: 'textfield',
|
xtype: 'textfield',
|
||||||
|
name: 'password',
|
||||||
inputType: 'password',
|
inputType: 'password',
|
||||||
fieldLabel: gettext('Password'),
|
fieldLabel: gettext('Password'),
|
||||||
name: 'password',
|
|
||||||
cbind: {
|
cbind: {
|
||||||
emptyText: '{passwordEmptyText}',
|
emptyText: '{passwordEmptyText}',
|
||||||
allowBlank: '{!isCreate}',
|
allowBlank: '{!isCreate}',
|
||||||
|
@ -110,10 +111,11 @@ Ext.define('PBS.window.RemoteEdit', {
|
||||||
{
|
{
|
||||||
xtype: 'proxmoxtextfield',
|
xtype: 'proxmoxtextfield',
|
||||||
name: 'fingerprint',
|
name: 'fingerprint',
|
||||||
|
fieldLabel: gettext('Fingerprint'),
|
||||||
|
emptyText: gettext("Server certificate's SHA-256 fingerprint, required for self-signed certificates"),
|
||||||
cbind: {
|
cbind: {
|
||||||
deleteEmpty: '{!isCreate}',
|
deleteEmpty: '{!isCreate}',
|
||||||
},
|
},
|
||||||
fieldLabel: gettext('Fingerprint'),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
xtype: 'proxmoxtextfield',
|
xtype: 'proxmoxtextfield',
|
||||||
|
|
Loading…
Reference in New Issue