mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-06-05 15:09:37 +09:00
- recover 2.0.34
This commit is contained in:
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -296,51 +296,3 @@ span.um-admin-icon-clear{
|
||||
span.um-admin-icon-clear.show {display: inline-block}
|
||||
span.um-admin-icon-clear:hover {color: #777}
|
||||
span.um-admin-icon-clear i {font-size: 20px;vertical-align: middle;}
|
||||
|
||||
.um-admin-new-condition-compare-and {
|
||||
margin-top: 10px !important;
|
||||
margin-bottom: 10px !important;
|
||||
text-align: center;
|
||||
}
|
||||
.um-admin-new-condition-compare-or {
|
||||
display: block !important;
|
||||
width: 150px;
|
||||
margin-top: 20px !important;
|
||||
text-align: center;
|
||||
}
|
||||
hr.or-devider {
|
||||
border-width: 3px;
|
||||
position: relative;
|
||||
overflow: visible;
|
||||
margin: 10px 0;
|
||||
}
|
||||
hr.or-devider:after {
|
||||
content: 'OR';
|
||||
display: block;
|
||||
position: absolute;
|
||||
background: #fff;
|
||||
left: 50%;
|
||||
margin: -11px 0 0 -13px;
|
||||
top: 50%;
|
||||
text-align: center;
|
||||
color: #000;
|
||||
width: 26px;
|
||||
}
|
||||
.um-admin-cur-condition {
|
||||
position: relative;
|
||||
}
|
||||
.um-admin-cur-condition:after {
|
||||
clear: both;
|
||||
content: '';
|
||||
display: block;
|
||||
}
|
||||
.um-admin-cur-condition + .um-admin-cur-condition:before {
|
||||
content: 'AND';
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: -25px;
|
||||
right: -7px;
|
||||
}
|
||||
.um-admin-cur-condition p:last-of-type('p') {
|
||||
float: right;
|
||||
}
|
||||
@@ -1,14 +1,9 @@
|
||||
function um_admin_live_update_scripts(count) {
|
||||
function um_admin_live_update_scripts() {
|
||||
|
||||
var metakey = jQuery('.um-admin-modal #UM_edit_field #_metakey').val();
|
||||
|
||||
if( count === 0 ){
|
||||
jQuery('.um_add_field .um-admin-btn-toggle').hide();
|
||||
} else if( metakey && count === 1 ){
|
||||
jQuery('.um_add_field .um-admin-btn-toggle').hide();
|
||||
} else {
|
||||
jQuery('.um_add_field .um-admin-btn-toggle').show();
|
||||
}
|
||||
/*jQuery('.um-admin-modal-body:visible select').select2({
|
||||
allowClear: false,
|
||||
minimumResultsForSearch: 10
|
||||
});*/
|
||||
|
||||
jQuery('.um-adm-conditional').each(function(){jQuery(this).trigger('change');});
|
||||
if ( jQuery('.um-admin-colorpicker').length ) {
|
||||
@@ -43,7 +38,7 @@ function um_admin_new_modal( id, ajax, size ){
|
||||
}
|
||||
|
||||
function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
|
||||
var count = jQuery('.um-admin-builder .um-admin-drag-fld').length;
|
||||
|
||||
in_row = '';
|
||||
in_sub_row = '';
|
||||
in_column = '';
|
||||
@@ -81,7 +76,7 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
|
||||
|
||||
um_responsive();
|
||||
|
||||
um_admin_live_update_scripts(count);
|
||||
um_admin_live_update_scripts();
|
||||
|
||||
jQuery( "#_custom_dropdown_options_source" ).trigger('blur');
|
||||
|
||||
@@ -194,17 +189,6 @@ jQuery(document).ready(function() {
|
||||
toggle area
|
||||
**/
|
||||
jQuery(document).on('click', '.um-admin-btn-toggle a', function(e){
|
||||
|
||||
jQuery('.condition-wrap .um-admin-cur-condition').each(function () {
|
||||
var cond_operator = jQuery(this).find('[id^="_conditional_operator"]').val();
|
||||
var cond_value = jQuery(this).find('[id^="_conditional_value"]');
|
||||
if( cond_operator === 'empty' || cond_operator === 'not empty' ){
|
||||
cond_value.attr('disabled','disabled');
|
||||
} else {
|
||||
cond_value.removeAttr('disabled');
|
||||
}
|
||||
});
|
||||
|
||||
var content = jQuery(this).parent().find('.um-admin-btn-content');
|
||||
var link = jQuery(this);
|
||||
if ( content.is(':hidden') ) {
|
||||
@@ -219,18 +203,7 @@ jQuery(document).ready(function() {
|
||||
um_admin_modal_responsive();
|
||||
});
|
||||
|
||||
/**
|
||||
check if empty/not empty
|
||||
**/
|
||||
jQuery(document).on('change', 'select[id^="_conditional_operator"]', function(){
|
||||
var cond_operator = jQuery(this).val();
|
||||
var cond_value = jQuery(this).closest('.um-admin-cur-condition').find('[id^="_conditional_value"]');
|
||||
if( cond_operator === 'empty' || cond_operator === 'not empty' ){
|
||||
cond_value.attr('disabled','disabled');
|
||||
} else {
|
||||
cond_value.removeAttr('disabled');
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
clone a condition
|
||||
@@ -244,37 +217,13 @@ jQuery(document).ready(function() {
|
||||
length = content.find('.um-admin-cur-condition').length;
|
||||
|
||||
if ( length < 5 ) {
|
||||
//content.find('select').select2('destroy');
|
||||
|
||||
if( jQuery('#UM_add_field .um-admin-btn-content .um-admin-cur-condition-template').length>0 ){
|
||||
var template = jQuery('#UM_add_field .um-admin-btn-content').find('.um-admin-cur-condition-template').clone();
|
||||
} else {
|
||||
var template = jQuery('#UM_edit_field .um-admin-btn-content').find('.um-admin-cur-condition-template').clone();
|
||||
}
|
||||
|
||||
var template = jQuery('.um-admin-btn-content').find('.um-admin-cur-condition-template').clone();
|
||||
template.find('input[type=text]').val('');
|
||||
template.find('select').val('');
|
||||
|
||||
if ( jQuery(this).hasClass('um-admin-new-condition-compare-and') ){
|
||||
|
||||
template.find('#_conditional_compare').val('and');
|
||||
var group = jQuery(this).prev('.um-admin-cur-condition').find('[id^="_conditional_group"]').val();
|
||||
|
||||
template.find('#_conditional_group').val(group);
|
||||
var templatehtml = template.html();
|
||||
template.insertBefore( jQuery(this) );
|
||||
|
||||
} else {
|
||||
|
||||
template.find('#_conditional_compare').val('or');
|
||||
var group = jQuery('.condition-wrap .um-admin-cur-condition').last().find('[id^="_conditional_group"]').val();
|
||||
template.find('#_conditional_group').val(parseInt(group)+1);
|
||||
var button = jQuery('.um-admin-new-condition-compare-and:first').clone();
|
||||
jQuery('<hr class="or-devider" />').insertBefore( jQuery(this) );
|
||||
template.insertBefore( jQuery(this) );
|
||||
button.addClass('for-remove-on-reset').insertBefore( jQuery(this) );
|
||||
|
||||
}
|
||||
|
||||
template.appendTo( content );
|
||||
jQuery(template).removeClass("um-admin-cur-condition-template");
|
||||
jQuery(template).addClass("um-admin-cur-condition");
|
||||
|
||||
@@ -286,10 +235,7 @@ jQuery(document).ready(function() {
|
||||
}
|
||||
//need fields refactor
|
||||
var conditions = jQuery('.um-admin-cur-condition');
|
||||
|
||||
jQuery(conditions).each( function ( i ) {
|
||||
// var value = jQuery( this )
|
||||
|
||||
id = i === 0 ? '' : i;
|
||||
jQuery( this ).find('[id^="_conditional_action"]').attr('name', '_conditional_action' + id);
|
||||
jQuery( this ).find('[id^="_conditional_action"]').attr('id', '_conditional_action' + id);
|
||||
@@ -299,10 +245,6 @@ jQuery(document).ready(function() {
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('name', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('id', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('name', '_conditional_group' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('id', '_conditional_group' + id);
|
||||
} );
|
||||
|
||||
});
|
||||
@@ -316,9 +258,6 @@ jQuery(document).ready(function() {
|
||||
content.find('input[type=text]').val('');
|
||||
content.find('select').val('');
|
||||
jQuery('.um-admin-new-condition').removeClass('disabled');
|
||||
jQuery('.condition-wrap hr').remove();
|
||||
jQuery('.condition-wrap .for-remove-on-reset').remove();
|
||||
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
});
|
||||
@@ -330,17 +269,7 @@ jQuery(document).ready(function() {
|
||||
var condition = jQuery(this).parents('.um-admin-cur-condition');
|
||||
jQuery('.um-admin-new-condition').removeClass('disabled');
|
||||
jQuery('.tipsy').remove();
|
||||
var compare = condition.find('input[type=hidden]').val();
|
||||
if( compare == 'or' ){
|
||||
condition.next().find('input[type=hidden]').val(compare);
|
||||
}
|
||||
|
||||
if( condition.prev().is('hr') && condition.next().is('.um-admin-new-condition-compare-and') ){
|
||||
condition.next().remove();
|
||||
condition.prev().remove();
|
||||
}
|
||||
condition.remove();
|
||||
|
||||
//need fields refactor
|
||||
var conditions = jQuery('.um-admin-cur-condition');
|
||||
jQuery(conditions).each( function ( i ) {
|
||||
@@ -353,10 +282,6 @@ jQuery(document).ready(function() {
|
||||
jQuery( this ).find('[id^="_conditional_operator"]').attr('id', '_conditional_operator' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('name', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_value"]').attr('id', '_conditional_value' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('name', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_compare"]').attr('id', '_conditional_compare' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('name', '_conditional_group' + id);
|
||||
jQuery( this ).find('[id^="_conditional_group"]').attr('id', '_conditional_group' + id);
|
||||
} );
|
||||
um_admin_live_update_scripts();
|
||||
um_admin_modal_responsive();
|
||||
|
||||
@@ -168,27 +168,27 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
|
||||
unset( $array['conditions'] );
|
||||
if ( isset($array['conditional_field']) && !empty( $array['conditional_action'] ) && !empty( $array['conditional_operator'] ) ) {
|
||||
$array['conditional_value'] = isset( $array['conditional_value'] ) ? $array['conditional_value'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'], $array['conditional_compare'], $array['conditional_group'] );
|
||||
$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field1']) && !empty( $array['conditional_action1'] ) && !empty( $array['conditional_operator1'] ) ) {
|
||||
$array['conditional_value1'] = isset( $array['conditional_value1'] ) ? $array['conditional_value1'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'], $array['conditional_compare1'], $array['conditional_group1'] );
|
||||
$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field2']) && !empty( $array['conditional_action2'] ) && !empty( $array['conditional_operator2'] ) ) {
|
||||
$array['conditional_value2'] = isset( $array['conditional_value2'] ) ? $array['conditional_value2'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'], $array['conditional_compare2'], $array['conditional_group2'] );
|
||||
$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field3']) && !empty( $array['conditional_action3'] ) && !empty( $array['conditional_operator3'] ) ) {
|
||||
$array['conditional_value3'] = isset( $array['conditional_value3'] ) ? $array['conditional_value3'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'], $array['conditional_compare3'], $array['conditional_group3'] );
|
||||
$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'] );
|
||||
}
|
||||
|
||||
if ( isset($array['conditional_field4']) && !empty( $array['conditional_action4'] ) && !empty( $array['conditional_operator4'] ) ) {
|
||||
$array['conditional_value4'] = isset( $array['conditional_value4'] ) ? $array['conditional_value4'] : '';
|
||||
$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'], $array['conditional_compare4'], $array['conditional_group4'] );
|
||||
$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'] );
|
||||
}
|
||||
|
||||
return $array;
|
||||
@@ -236,40 +236,33 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
|
||||
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_compare', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_group', $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>
|
||||
<?php /*<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><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>
|
||||
<div class="condition-wrap">
|
||||
|
||||
<?php if ( isset( $edit_array['conditions'] ) && count( $edit_array['conditions'] ) != 0 ) {
|
||||
|
||||
foreach ( $edit_array['conditions'] as $k => $arr ) {
|
||||
|
||||
if ( $k == 0 ) $k = ''; ?>
|
||||
<?php if( $arr[4] == 'or' ){ ?>
|
||||
<a href="#" class="for-remove-on-reset um-admin-new-condition um-admin-new-condition-compare-and button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a>
|
||||
|
||||
<hr class="or-devider" />
|
||||
<?php } ?>
|
||||
<div class="um-admin-cur-condition">
|
||||
|
||||
<?php $metabox->field_input( '_conditional_action' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_field' . $k , $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_compare' . $k, $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_group' . $k, $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>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
||||
@@ -281,8 +274,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
|
||||
<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_compare', $form_id ); ?>
|
||||
<?php $metabox->field_input( '_conditional_group', $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>
|
||||
|
||||
@@ -290,10 +281,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
<a href="#" class="um-admin-new-condition um-admin-new-condition-compare-and button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a>
|
||||
<a href="#" class="um-admin-new-condition um-admin-new-condition-compare-or button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule group', 'ultimate-member' ); ?></a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -31,6 +31,13 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set Form Data
|
||||
*
|
||||
* @param $data
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
function set_data( $data ) {
|
||||
$this->form_data = $data;
|
||||
return $this;
|
||||
@@ -46,8 +53,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
*/
|
||||
function render_form( $echo = true ) {
|
||||
|
||||
if ( empty( $this->form_data['fields'] ) )
|
||||
if ( empty( $this->form_data['fields'] ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$class = 'form-table um-form-table ' . ( ! empty( $this->form_data['class'] ) ? $this->form_data['class'] : '' );
|
||||
$class_attr = ' class="' . $class . '" ';
|
||||
@@ -318,8 +326,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
|
||||
*/
|
||||
function render_hidden( $field_data ) {
|
||||
|
||||
if ( empty( $field_data['id'] ) )
|
||||
if ( empty( $field_data['id'] ) ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
|
||||
$id_attr = ' id="' . $id . '" ';
|
||||
|
||||
@@ -1344,30 +1344,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
|
||||
<p>
|
||||
<input type="text" name="<?php echo $attribute; ?>" id="<?php echo $attribute; ?>" value="<?php echo isset( $this->edit_mode_value ) ? $this->edit_mode_value : ''; ?>" placeholder="<?php _e( 'Value', 'ultimate-member' ); ?>" style="width: 150px!important;position: relative;top: -1px;" />
|
||||
</p>
|
||||
<?php
|
||||
break;
|
||||
|
||||
case '_conditional_compare':
|
||||
case '_conditional_compare1':
|
||||
case '_conditional_compare2':
|
||||
case '_conditional_compare3':
|
||||
case '_conditional_compare4':
|
||||
?>
|
||||
<p>
|
||||
<input type="hidden" name="<?php echo $attribute; ?>" id="<?php echo $attribute; ?>" value="<?php echo isset( $this->edit_mode_value ) ? $this->edit_mode_value : ''; ?>">
|
||||
</p>
|
||||
<?php
|
||||
break;
|
||||
|
||||
case '_conditional_group':
|
||||
case '_conditional_group1':
|
||||
case '_conditional_group2':
|
||||
case '_conditional_group3':
|
||||
case '_conditional_group4':
|
||||
?>
|
||||
<p>
|
||||
<input type="hidden" name="<?php echo $attribute; ?>" id="<?php echo $attribute; ?>" value="<?php echo isset( $this->edit_mode_value ) ? $this->edit_mode_value : '0'; ?>">
|
||||
</p>
|
||||
<?php
|
||||
break;
|
||||
|
||||
|
||||
@@ -202,16 +202,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
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 ][ 'conditional_compare' . $deleted_field_id ] );
|
||||
unset( $condition_fields[ $key ][ 'conditional_group' . $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 ][ 'conditional_compare' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ][ 'conditional_group' . $deleted_field_id ] );
|
||||
unset( $fields[ $key ]['conditions'][ $arr_id ] );
|
||||
}
|
||||
}
|
||||
@@ -263,40 +259,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
}
|
||||
}
|
||||
|
||||
$keys = array_keys($fields);
|
||||
$last_key = end($keys);
|
||||
unset($fields[$last_key]['conditions']);
|
||||
unset($fields[$last_key]['conditional_action']);
|
||||
unset($fields[$last_key]['conditional_action1']);
|
||||
unset($fields[$last_key]['conditional_action2']);
|
||||
unset($fields[$last_key]['conditional_action3']);
|
||||
unset($fields[$last_key]['conditional_action4']);
|
||||
unset($fields[$last_key]['conditional_field']);
|
||||
unset($fields[$last_key]['conditional_field1']);
|
||||
unset($fields[$last_key]['conditional_field2']);
|
||||
unset($fields[$last_key]['conditional_field3']);
|
||||
unset($fields[$last_key]['conditional_field4']);
|
||||
unset($fields[$last_key]['conditional_operator']);
|
||||
unset($fields[$last_key]['conditional_operator1']);
|
||||
unset($fields[$last_key]['conditional_operator2']);
|
||||
unset($fields[$last_key]['conditional_operator3']);
|
||||
unset($fields[$last_key]['conditional_operator4']);
|
||||
unset($fields[$last_key]['conditional_value']);
|
||||
unset($fields[$last_key]['conditional_value1']);
|
||||
unset($fields[$last_key]['conditional_value2']);
|
||||
unset($fields[$last_key]['conditional_value3']);
|
||||
unset($fields[$last_key]['conditional_value4']);
|
||||
unset($fields[$last_key]['conditional_group']);
|
||||
unset($fields[$last_key]['conditional_group1']);
|
||||
unset($fields[$last_key]['conditional_group2']);
|
||||
unset($fields[$last_key]['conditional_group3']);
|
||||
unset($fields[$last_key]['conditional_group4']);
|
||||
unset($fields[$last_key]['conditional_compare']);
|
||||
unset($fields[$last_key]['conditional_compare1']);
|
||||
unset($fields[$last_key]['conditional_compare2']);
|
||||
unset($fields[$last_key]['conditional_compare3']);
|
||||
unset($fields[$last_key]['conditional_compare4']);
|
||||
|
||||
// add field to form
|
||||
UM()->query()->update_attr( 'custom_fields', $form_id, $fields );
|
||||
|
||||
@@ -1283,8 +1245,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
if (isset( $array['conditions'] ) && is_array( $array['conditions'] ) && !$this->viewing) {
|
||||
$array['conditional'] = '';
|
||||
|
||||
$cond_data = json_encode($array['conditions']);
|
||||
$array['conditional'] .= " data-conds='".$cond_data."'";
|
||||
foreach ($array['conditions'] as $cond_id => $cond) {
|
||||
$array['conditional'] .= ' data-cond-' . $cond_id . '-action="' . $cond[0] . '" data-cond-' . $cond_id . '-field="' . $cond[1] . '" data-cond-' . $cond_id . '-operator="' . $cond[2] . '" data-cond-' . $cond_id . '-value="' . $cond[3] . '"';
|
||||
}
|
||||
|
||||
$array['classes'] .= ' um-is-conditional';
|
||||
|
||||
|
||||
+700
-706
File diff suppressed because it is too large
Load Diff
@@ -1,28 +1,38 @@
|
||||
<?php foreach( UM()->shortcodes()->loop as $comment ) { ?>
|
||||
<?php $post_type = get_post_type( $comment->comment_post_ID );
|
||||
if( $post_type == 'um_groups_discussion' ){
|
||||
<?php if ( ! defined( 'ABSPATH' ) ) exit;
|
||||
|
||||
foreach ( UM()->shortcodes()->loop as $comment ) {
|
||||
|
||||
$post_type = get_post_type( $comment->comment_post_ID );
|
||||
if ( $post_type == 'um_groups_discussion' ) {
|
||||
$comment_id = $comment->comment_post_ID;
|
||||
$group_id = get_post_meta( $comment_id, '_group_id', true);
|
||||
$comment_title = get_the_title($group_id);
|
||||
$link = site_url().'/groups/'.$comment_title.'/?tab=discussion'.'#commentid-'.$comment_id;
|
||||
$group_id = get_post_meta( $comment_id, '_group_id', true );
|
||||
$comment_title = get_the_title( $group_id );
|
||||
$link = site_url() . '/groups/' . $comment_title . '/?tab=discussion#commentid-' . $comment_id;
|
||||
} else {
|
||||
$comment_title = get_the_title($comment->comment_post_ID);
|
||||
$link = get_permalink($comment->comment_post_ID);
|
||||
}
|
||||
?>
|
||||
$comment_title = get_the_title( $comment->comment_post_ID );
|
||||
$link = get_permalink( $comment->comment_post_ID );
|
||||
} ?>
|
||||
|
||||
<div class="um-item">
|
||||
<div class="um-item-link"><i class="um-icon-chatboxes"></i><a href="<?php echo get_comment_link( $comment->comment_ID ); ?>"><?php echo get_comment_excerpt( $comment->comment_ID ); ?></a></div>
|
||||
<div class="um-item-link">
|
||||
<i class="um-icon-chatboxes"></i>
|
||||
<a href="<?php echo get_comment_link( $comment->comment_ID ); ?>">
|
||||
<?php echo get_comment_excerpt( $comment->comment_ID ); ?>
|
||||
</a>
|
||||
</div>
|
||||
<div class="um-item-meta">
|
||||
<span><?php printf(__('On <a href="%1$s">%2$s</a>','ultimate-member'), $link, $comment_title ); ?></span>
|
||||
<span><?php printf( __( 'On <a href="%1$s">%2$s</a>','ultimate-member' ), $link, $comment_title ); ?></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
<?php }
|
||||
|
||||
<?php if ( isset( UM()->shortcodes()->modified_args) && count(UM()->shortcodes()->loop) >= 10 ) { ?>
|
||||
if ( isset( UM()->shortcodes()->modified_args ) && count(UM()->shortcodes()->loop ) >= 10 ) { ?>
|
||||
|
||||
<div class="um-load-items">
|
||||
<a href="#" class="um-ajax-paginate um-button" data-hook="um_load_comments" data-args="<?php echo UM()->shortcodes()->modified_args; ?>"><?php _e('load more comments','ultimate-member'); ?></a>
|
||||
<a href="#" class="um-ajax-paginate um-button" data-hook="um_load_comments" data-args="<?php echo UM()->shortcodes()->modified_args; ?>">
|
||||
<?php _e('load more comments','ultimate-member'); ?>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
<?php }
|
||||
Reference in New Issue
Block a user