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

Fixed important issue with row styling

Browse Source
This commit is contained in:
ultimatemember
2015-01-09 20:12:06 +02:00
parent c9a092ed48
commit 3ab001ce97
5 changed files with 114 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/js/um-admin-dragdrop.js
+6
View File
@@ -170,8 +170,13 @@ function UM_Rows_Refresh(){
sub_rows_count = row.find('.um-admin-drag-rowsub').length;
var origin_id = jQuery(this).attr('data-original');
jQuery('.um_update_order_fields').append('<input type="hidden" name="_um_row_'+c+'" id="_um_row_'+c+'" value="_um_row_'+c+'" />');
jQuery('.um_update_order_fields').append('<input type="hidden" name="_um_roworigin_'+c+'_val" id="_um_roworigin_'+c+'_val" value="'+origin_id+'" />');
jQuery('.um_update_order_fields').append('<input type="hidden" name="_um_rowsub_'+c+'_rows" id="_um_rowsub_'+c+'_rows" value="'+sub_rows_count+'" />');
jQuery(this).attr('data-original', '_um_row_'+c );
});
@@ -300,6 +305,7 @@ jQuery(document).ready(function() {
var dragg = jQuery('.um-admin-drag-ajax');
dragg.append( '<div class="um-admin-drag-row">' + jQuery('.um-col-demon-row').html() + '</div>' );
dragg.find('.um-admin-drag-row:last').find('.um-admin-drag-row-icons').find('a.um-admin-drag-row-edit').attr('data-arg3', '_um_row_' + ( dragg.find('.um-admin-drag-row').length ) );
dragg.find('.um-admin-drag-row:last').attr('data-original', '_um_row_' + ( dragg.find('.um-admin-drag-row').length ) );
UM_update_rows();
UM_update_subrows();
UM_Rows_Refresh();
admin/core/um-admin-actions-fields.php
+1 -1
View File
@@ -31,7 +31,7 @@
$save[ $_metakey ]['icon'] = '';
foreach( $array['post'] as $key => $val){
if ( substr( $key, 0, 1) === '_' && $val != '' ) { // field attribute
if ( substr( $key, 0, 1) === '_' ) { // field attribute
$new_key = ltrim ($key,'_');
if ( $new_key == 'options' ) {
admin/core/um-admin-builder.php
+3 -1
View File
@@ -78,6 +78,8 @@ class UM_Admin_Builder {
***/
function show_builder(){
global $ultimatemember;
//print_r( get_option('um_form_rowdata_' . $this->form_id ) );
$fields = $ultimatemember->query->get_attr('custom_fields', $this->form_id );
@@ -149,7 +151,7 @@ class UM_Admin_Builder {
?>
<div class="um-admin-drag-row">
<div class="um-admin-drag-row" data-original="<?php echo $row_id; ?>">
<!-- Master Row Actions -->
<div class="um-admin-drag-row-icons">
admin/core/um-admin-dragdrop.php
+26 -8
View File
@@ -32,14 +32,14 @@ class UM_Admin_DragDrop {
unset( $fields[$key] );
}
}
update_option('um_form_rowdata_' . $form_id , $this->row_data );
foreach( $_POST as $key => $value ) {
// adding rows
if (0 === strpos($key, '_um_row_')) {
$update_args = null;
$row_id = str_replace( '_um_row_', '', $key );
$row_array = array(
@@ -47,14 +47,23 @@ class UM_Admin_DragDrop {
'id' => $value,
'sub_rows' => $_POST[ '_um_rowsub_'.$row_id .'_rows' ],
'cols' => $_POST[ '_um_rowcols_'.$row_id .'_cols' ],
'origin' => $_POST[ '_um_roworigin_'.$row_id . '_val' ],
);
if ( isset( $this->row_data[$key] ) ) {
$row_args = array_merge( $this->row_data[$key], $row_array );
} else {
$row_args = $row_array;
}
$row_args = $row_array;
if ( isset( $this->row_data[ $row_array['origin'] ] ) ) {
foreach( $this->row_data[ $row_array['origin'] ] as $k => $v ){
if ( $k != 'position' && $k != 'metakey' ) {
$update_args[$k] = $v;
}
}
if ( isset( $update_args ) ) {
$row_args = array_merge( $update_args, $row_array );
}
$this->exist_rows[] = $key;
}
$fields[$key] = $row_args;
}
@@ -101,6 +110,15 @@ class UM_Admin_DragDrop {
}
foreach( $this->row_data as $k => $v ) {
if ( !in_array( $k, $this->exist_rows ) )
unset( $this->row_data[$k] );
}
update_option('um_existing_rows_' . $form_id, $this->exist_rows );
update_option('um_form_rowdata_' . $form_id , $this->row_data );
$ultimatemember->query->update_attr( 'custom_fields', $form_id, $fields );
}