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

Merge branch 'fix_conditions_fields_logic' of https://github.com/ultimatemember/ultimatemember into release/2.0.18

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-06-07 18:01:46 +03:00
parent edd59fb894 49790e835f
commit 6505c4e4e5
8 changed files with 93 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+37 -7
View File
@@ -182,8 +182,38 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
*/
function delete_field_from_form( $id, $form_id ) {
$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
if (isset( $fields[$id] )) {
unset( $fields[$id] );
if ( isset( $fields[ $id ] ) ) {
$condition_fields = get_option( 'um_fields' );
foreach ( $condition_fields as $key => $value ) {
$deleted_field = array_search( $id, $value );
if ( $key != $id && $deleted_field != false ) {
$deleted_field_id = str_replace( 'conditional_field', '', $deleted_field );
if ( $deleted_field_id == '' ) {
$arr_id = 0;
} else {
$arr_id = $deleted_field_id;
}
unset( $condition_fields[ $key ][ 'conditional_action' . $deleted_field_id ] );
unset( $condition_fields[ $key ][ $deleted_field ] );
unset( $condition_fields[ $key ][ 'conditional_operator' . $deleted_field_id ] );
unset( $condition_fields[ $key ][ 'conditional_value' . $deleted_field_id ] );
unset( $condition_fields[ $key ]['conditions'][ $arr_id ] );
unset( $fields[ $key ][ 'conditional_action' . $deleted_field_id ] );
unset( $fields[ $key ][ $deleted_field ] );
unset( $fields[ $key ][ 'conditional_operator' . $deleted_field_id ] );
unset( $fields[ $key ][ 'conditional_value' . $deleted_field_id ] );
unset( $fields[ $key ]['conditions'][ $arr_id ] );
}
}
update_option( 'um_fields' , $condition_fields );
unset( $fields[ $id ] );
UM()->query()->update_attr( 'custom_fields', $form_id, $fields );
}
}
@@ -4010,23 +4040,23 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
switch ($act_id) {
case 'um_admin_duplicate_field':
UM()->fields()->duplicate_field( $arg1, $arg2 );
$this->duplicate_field( $arg1, $arg2 );
break;
case 'um_admin_remove_field_global':
UM()->fields()->delete_field_from_db( $arg1 );
$this->delete_field_from_db( $arg1 );
break;
case 'um_admin_remove_field':
UM()->fields()->delete_field_from_form( $arg1, $arg2 );
$this->delete_field_from_form( $arg1, $arg2 );
break;
case 'um_admin_add_field_from_predefined':
UM()->fields()->add_field_from_predefined( $arg1, $arg2, $position );
$this->add_field_from_predefined( $arg1, $arg2, $position );
break;
case 'um_admin_add_field_from_list':
UM()->fields()->add_field_from_list( $arg1, $arg2, $position );
$this->add_field_from_list( $arg1, $arg2, $position );
break;
}