From c1badd0bca37203e420a7b8013eaca959c8a991f Mon Sep 17 00:00:00 2001 From: Denis Baranov Date: Mon, 2 Jul 2018 18:14:25 +0300 Subject: [PATCH] code refactor --- includes/admin/assets/js/um-admin-field.js | 5 ----- includes/core/class-fields.php | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/includes/admin/assets/js/um-admin-field.js b/includes/admin/assets/js/um-admin-field.js index edefd3d7..d8843d2c 100644 --- a/includes/admin/assets/js/um-admin-field.js +++ b/includes/admin/assets/js/um-admin-field.js @@ -30,11 +30,6 @@ jQuery(document).ready(function() { /* Add a Field */ jQuery(document).on('submit', 'form.um_add_field', function(e){ -<<<<<<< HEAD -======= - console.log(um_admin_field_data.ajax_url); - ->>>>>>> 847a773d7011431827a5dd4edc3487e7ae093a37 e.preventDefault(); var form = jQuery(this); diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php index 74f59624..80a1a6a3 100644 --- a/includes/core/class-fields.php +++ b/includes/core/class-fields.php @@ -4040,23 +4040,23 @@ if ( ! class_exists( 'um\core\Fields' ) ) { switch ($act_id) { case 'um_admin_duplicate_field': - $this->duplicate_field( $arg1, $arg2 ); + UM()->fields()->duplicate_field( $arg1, $arg2 ); break; case 'um_admin_remove_field_global': - $this->delete_field_from_db( $arg1 ); + UM()->fields()->delete_field_from_db( $arg1 ); break; case 'um_admin_remove_field': - $this->delete_field_from_form( $arg1, $arg2 ); + UM()->fields()->delete_field_from_form( $arg1, $arg2 ); break; case 'um_admin_add_field_from_predefined': - $this->add_field_from_predefined( $arg1, $arg2, $position ); + UM()->fields()->add_field_from_predefined( $arg1, $arg2, $position ); break; case 'um_admin_add_field_from_list': - $this->add_field_from_list( $arg1, $arg2, $position ); + UM()->fields()->add_field_from_list( $arg1, $arg2, $position ); break; }