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

- added default values for date/time picker;

Browse Source 
- fixed theme upgrader;
This commit is contained in:
nikitasinelnikov
2019-04-16 00:57:27 +03:00
parent d8c43edd1e
commit c3b308f0e7
10 changed files with 515 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-builtin.php
+6 -6
View File
@@ -392,27 +392,27 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
),
'_max_size' => array(
'mode' => 'numeric',
'error' => __('Please enter a valid size','ultimate-member')
'error' => __( 'Please enter a valid size', 'ultimate-member' )
),
)
),
'date' => array(
'name' => 'Date Picker',
'col1' => array('_title','_metakey','_help','_range','_years','_years_x','_range_start','_range_end','_visibility'),
'col1' => array('_title','_metakey','_help','_default','_range','_years','_years_x','_range_start','_range_end','_visibility'),
'col2' => array('_label','_placeholder','_public','_roles','_format','_pretty_format','_disabled_weekdays'),
'col3' => array('_required','_editable','_icon'),
'validate' => array(
'_title' => array(
'mode' => 'required',
'error' => __('You must provide a title','ultimate-member')
'error' => __( 'You must provide a title', 'ultimate-member' )
),
'_metakey' => array(
'mode' => 'unique',
),
'_years' => array(
'mode' => 'numeric',
'error' => __('Number of years is not valid','ultimate-member')
'error' => __( 'Number of years is not valid', 'ultimate-member' )
),
'_range_start' => array(
'mode' => 'range-start',
@@ -426,12 +426,12 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
'time' => array(
'name' => 'Time Picker',
'col1' => array('_title','_metakey','_help','_format','_visibility'),
'col2' => array('_label','_placeholder','_public','_roles','_intervals'),
'col2' => array('_label','_placeholder','_default','_public','_roles','_intervals'),
'col3' => array('_required','_editable','_icon'),
'validate' => array(
'_title' => array(
'mode' => 'required',
'error' => __('You must provide a title','ultimate-member')
'error' => __( 'You must provide a title', 'ultimate-member' )
),
'_metakey' => array(
'mode' => 'unique',
includes/core/class-fields.php
+4 -1
View File
@@ -584,7 +584,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
return $_SESSION['um_social_profile'][ $key ];
}
$value = '';
$type = ( isset( $data['type'] ) ) ? $data['type'] : '';
// preview in backend
@@ -787,6 +786,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
*/
$value = apply_filters( "um_edit_{$key}_field_value", $default, $key );
} else {
$value = '';
}
@@ -2120,6 +2121,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
//var_dump( $this->field_value( $key, $default, $data ) );
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . $input . '" name="' . $key . UM()->form()->form_suffix . '" id="' . $key . UM()->form()->form_suffix . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . $placeholder . '" data-validate="' . $validate . '" data-key="' . $key . '" data-range="' . $range . '" data-years="' . $years . '" data-years_x="' . $years_x . '" data-disabled_weekdays="' . $disabled_weekdays . '" data-date_min="' . $date_min . '" data-date_max="' . $date_max . '" data-format="' . $js_format . '" data-value="' . $this->field_value( $key, $default, $data ) . '" />
</div>';
includes/core/um-filters-fields.php
+24 -1
View File
@@ -729,4 +729,27 @@ function um_edit_url_field_value( $value, $key ) {
$value = esc_attr( $value );
return $value;
}
add_filter( 'um_edit_url_field_value', 'um_edit_url_field_value', 10, 2 );
add_filter( 'um_edit_url_field_value', 'um_edit_url_field_value', 10, 2 );
/**
* Set current date if date value is empty
*
* @param string $value "Field Value"
* @param string $default "Field Key"
* @param string $key "Field Type"
* @param string $type "Field Default Value"
* @param array $data "Field Data"
* @return string
*/
function um_field_value__default_datetime( $value, $default, $key, $type, $data ) {
if ( empty( $value ) && empty( $default ) && $type === 'date' ) {
$value = date( 'Y/m/d' );
} elseif ( empty( $value ) && empty( $default ) && $type === 'time' ) {
$value = date( 'H:i' );
}
return $value;
}
add_filter( 'um_field_value', 'um_field_value__default_datetime', 10, 5 );