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

Merge branch 'fix_conditions_fields_logic'

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-07-02 18:32:33 +03:00
parent 58609a8ebf c1badd0bca
commit 8b846b50cc
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-field.js
+3 -2
View File
@@ -29,7 +29,7 @@ jQuery(document).ready(function() {
/* Add a Field */
jQuery(document).on('submit', 'form.um_add_field', function(e){
e.preventDefault();
var form = jQuery(this);
@@ -49,6 +49,7 @@ jQuery(document).ready(function() {
form.css({'opacity': 1});
},
success: function(data){
console.log(data);
if (data.error){
c = 0;
@@ -76,7 +77,7 @@ jQuery(document).ready(function() {
},
error: function(data){
console.log(data);
}
});
includes/admin/core/class-admin-builder.php
+13 -13
View File
@@ -230,7 +230,17 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php } ?>
<div class="um-admin-btn-content">
<div class="um-admin-cur-condition-template">
<?php $metabox->field_input( '_conditional_action', $form_id ); ?>
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
<div class="um-admin-clear"></div>
</div>
<p><a href="#" class="um-admin-new-condition button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a></p>
<p class="um-admin-reset-conditions"><a href="#" class="button"><?php _e( 'Reset all rules', 'ultimate-member' ); ?></a></p>
<div class="um-admin-clear"></div>
@@ -265,25 +275,13 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
<p><a href="#" class="um-admin-new-condition button um-admin-tipsy-n" title="Add new condition"><i class="um-icon-plus" style="margin-right:0!important"></i></a></p>
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
<div class="um-admin-clear"></div>
</div>
<?php } ?>
<div class="um-admin-cur-condition-template">
<?php $metabox->field_input( '_conditional_action', $form_id ); ?>
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
<div class="um-admin-clear"></div>
</div>
</div>
</div>
<?php
@@ -608,6 +606,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
*
*/
function update_field() {
// var_dump($_POST);
// die;
if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) )
die( __('Please login as administrator','ultimate-member') );
includes/core/class-fields.php
+5 -5
View File
@@ -4038,23 +4038,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;
}