10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fix small errors

Browse Source
This commit is contained in:
ashubawork
2023-05-24 16:18:08 +03:00
parent e4c30a472e
commit 568b56d267
3 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/css/um-admin-forms.css
+8
View File
@@ -146,6 +146,14 @@ textarea.um-forms-field.um-small-field {
flex: 0.9;
}
.um-multi-selects-option-line .um-field-wrapper.um-custom-order-fields label select{
width: auto;
display: inline;
font-weight: normal;
max-width: 70%;
flex: 0.9;
}
.um-multi-selects-option-line.um-admin-drag-fld .um-field-wrapper {
width: calc( 100% - 90px );
}
includes/admin/assets/js/um-admin-forms.js
+6 -4
View File
@@ -250,7 +250,7 @@ jQuery(document).ready( function() {
'<a href="javascript:void(0);" class="um-select-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a>' +
'</span>' +
'<span class="um-field-wrapper um-custom-order-fields"><label>' + wp.i18n.__( 'Meta key', 'ultimate-member' ) + ':&nbsp;<input type="text" name="meta_key" /></label></span>' +
'<span class="um-field-wrapper um-custom-order-fields"><label>' + wp.i18n.__( 'Data type', 'ultimate-member' ) + ':&nbsp;</label><select name="data_type" />' +
'<span class="um-field-wrapper um-custom-order-fields"><label>' + wp.i18n.__( 'Data type', 'ultimate-member' ) + ':&nbsp;<select name="data_type" />' +
'<option value="CHAR">' + wp.i18n.__( 'CHAR', 'ultimate-member' ) + '</option>' +
'<option value="NUMERIC">' + wp.i18n.__( 'NUMERIC', 'ultimate-member' ) + '</option>' +
'<option value="BINARY">' + wp.i18n.__( 'BINARY', 'ultimate-member' ) + '</option>' +
@@ -260,11 +260,11 @@ jQuery(document).ready( function() {
'<option value="SIGNED">' + wp.i18n.__( 'SIGNED', 'ultimate-member' ) + '</option>' +
'<option value="TIME">' + wp.i18n.__( 'TIME', 'ultimate-member' ) + '</option>' +
'<option value="UNSIGNED">' + wp.i18n.__( 'UNSIGNED', 'ultimate-member' ) + '</option>' +
'</select></span>' +
'<span class="um-field-wrapper um-custom-order-fields"><label>' + wp.i18n.__( 'Order', 'ultimate-member' ) + ':&nbsp;</label><select name="data_type" />' +
'</select></label></span>' +
'<span class="um-field-wrapper um-custom-order-fields"><label>' + wp.i18n.__( 'Order', 'ultimate-member' ) + ':&nbsp;<select name="order" />' +
'<option value="ASC">' + wp.i18n.__( 'ASC', 'ultimate-member' ) + '</option>' +
'<option value="DESC">' + wp.i18n.__( 'DESC', 'ultimate-member' ) + '</option>' +
'</select></span>' +
'</select></label></span>' +
'<span class="um-field-wrapper um-custom-order-fields"><label>' + wp.i18n.__( 'Label', 'ultimate-member' ) + ':&nbsp;<input type="text" name="label" /></label></span>' +
'</li>';
list.append( html );
@@ -274,6 +274,8 @@ jQuery(document).ready( function() {
jQuery( '#' + list.data('id_attr') + '-' + k ).parents('li').find('.um-field-wrapper.um-custom-order-fields input[name="meta_key"]').attr('name', 'um_metadata[_um_sorting_fields][other_data][' + k + '][meta_key]');
jQuery( '#' + list.data('id_attr') + '-' + k ).parents('li').find('.um-field-wrapper.um-custom-order-fields input[name="label"]').attr('name', 'um_metadata[_um_sorting_fields][other_data][' + k + '][label]');
jQuery( '#' + list.data('id_attr') + '-' + k ).parents('li').find('.um-field-wrapper.um-custom-order-fields select[name="data_type"]').attr('name', 'um_metadata[_um_sorting_fields][other_data][' + k + '][data_type]');
jQuery( '#' + list.data('id_attr') + '-' + k ).parents('li').find('.um-field-wrapper.um-custom-order-fields select[name="order"]').attr('name', 'um_metadata[_um_sorting_fields][other_data][' + k + '][order]');
});
includes/admin/core/class-admin-forms.php
+29 -19
View File
@@ -1594,14 +1594,24 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
$other_label = '';
$other_type = '';
$other_order = '';
if ( is_array( $value ) ) {
$keys = array_keys( $value );
$other_key = $keys[0];
$labels = array_values( $value );
$other_label = $labels[0];
$other_type = $value['type'];
$other_order = $value['order'];
if ( ! empty( $value['label'] ) ) {
$other_label = $value['label'];
} else {
$labels = array_values( $value );
$other_label = $labels[0];
}
if ( ! empty( $value['type'] ) ) {
$other_type = $value['type'];
}
if ( ! empty( $value['order'] ) ) {
$other_order = $value['order'];
}
} else {
if ( ! in_array( $value, array_keys( $field_data['options'] ) ) ) {
continue;
@@ -1629,21 +1639,21 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
<select ' . $id_attr . ' ' . $name_attr . ' ' . $class_attr . ' ' . $data_attr . '>' . $options . '</select></span>
<span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' . __( 'Remove', 'ultimate-member' ) . '</a></span>
<span class="um-field-wrapper um-custom-order-fields"><label>' . __( 'Meta key', 'ultimate-member' ) . ':&nbsp;<input type="text" name="um_metadata[_um_sorting_fields][other_data][' . $k . '][meta_key]" value="' . esc_attr( $other_key ) . '" /></label></span>
<span class="um-field-wrapper um-custom-order-fields"><label>' . __( 'Data type', 'ultimate-member' ) . ':&nbsp;</label><select name="um_metadata[_um_sorting_fields][other_data][' . $k . '][data_type]" />
<option value="CHAR" ' . selected( $other_type, 'CHAR' ) . '>' . __( 'CHAR', 'ultimate-member' ) . '</option>
<option value="NUMERIC" ' . selected( $other_type, 'NUMERIC' ) . '>' . __( 'NUMERIC', 'ultimate-member' ) . '</option>
<option value="BINARY" ' . selected( $other_type, 'BINARY' ) . '>' . __( 'BINARY', 'ultimate-member' ) . '</option>
<option value="DATE" ' . selected( $other_type, 'DATE' ) . '>' . __( 'DATE', 'ultimate-member' ) . '</option>
<option value="DATETIME" ' . selected( $other_type, 'DATETIME' ) . '>' . __( 'DATETIME', 'ultimate-member' ) . '</option>
<option value="DECIMAL" ' . selected( $other_type, 'DECIMAL' ) . '>' . __( 'DECIMAL', 'ultimate-member' ) . '</option>
<option value="SIGNED" ' . selected( $other_type, 'SIGNED' ) . '>' . __( 'SIGNED', 'ultimate-member' ) . '</option>
<option value="TIME" ' . selected( $other_type, 'TIME' ) . '>' . __( 'TIME', 'ultimate-member' ) . '</option>
<option value="UNSIGNED" ' . selected( $other_type, 'UNSIGNED' ) . '>' . __( 'UNSIGNED', 'ultimate-member' ) . '</option>
</select></span>
<span class="um-field-wrapper um-custom-order-fields"><label>' . __( 'Order', 'ultimate-member' ) . ':&nbsp;</label><select name="um_metadata[_um_sorting_fields][other_data][' . $k . '][order]" />
<option value="ASC" ' . selected( $other_order, 'ASC' ) . '>' . __( 'ASC', 'ultimate-member' ) . '</option>
<option value="DESC" ' . selected( $other_order, 'DESC' ) . '>' . __( 'DESC', 'ultimate-member' ) . '</option>
</select></span>
<span class="um-field-wrapper um-custom-order-fields"><label>' . __( 'Data type', 'ultimate-member' ) . ':&nbsp;<select name="um_metadata[_um_sorting_fields][other_data][' . $k . '][data_type]" />
<option value="CHAR" ' . selected( $other_type, 'CHAR', false ) . '>' . __( 'CHAR', 'ultimate-member' ) . '</option>
<option value="NUMERIC" ' . selected( $other_type, 'NUMERIC', false ) . '>' . __( 'NUMERIC', 'ultimate-member' ) . '</option>
<option value="BINARY" ' . selected( $other_type, 'BINARY', false ) . '>' . __( 'BINARY', 'ultimate-member' ) . '</option>
<option value="DATE" ' . selected( $other_type, 'DATE', false ) . '>' . __( 'DATE', 'ultimate-member' ) . '</option>
<option value="DATETIME" ' . selected( $other_type, 'DATETIME', false ) . '>' . __( 'DATETIME', 'ultimate-member' ) . '</option>
<option value="DECIMAL" ' . selected( $other_type, 'DECIMAL', false ) . '>' . __( 'DECIMAL', 'ultimate-member' ) . '</option>
<option value="SIGNED" ' . selected( $other_type, 'SIGNED', false ) . '>' . __( 'SIGNED', 'ultimate-member' ) . '</option>
<option value="TIME" ' . selected( $other_type, 'TIME', false ) . '>' . __( 'TIME', 'ultimate-member' ) . '</option>
<option value="UNSIGNED" ' . selected( $other_type, 'UNSIGNED', false ) . '>' . __( 'UNSIGNED', 'ultimate-member' ) . '</option>
</select></label></span>
<span class="um-field-wrapper um-custom-order-fields"><label>' . __( 'Order', 'ultimate-member' ) . ':&nbsp;<select name="um_metadata[_um_sorting_fields][other_data][' . $k . '][order]" />
<option value="ASC" ' . selected( $other_order, 'ASC', false ) . '>' . __( 'ASC', 'ultimate-member' ) . '</option>
<option value="DESC" ' . selected( $other_order, 'DESC', false ) . '>' . __( 'DESC', 'ultimate-member' ) . '</option>
</select></label></span>
<span class="um-field-wrapper um-custom-order-fields"><label>' . __( 'Label', 'ultimate-member' ) . ':&nbsp;<input type="text" name="um_metadata[_um_sorting_fields][other_data][' . $k . '][label]" value="' . esc_attr( $other_label ) . '" /></label></span>
</li>';
}