<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2801] trunk/bp-xprofile:
Allow xprofile fields to be moved between groups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2801</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-03-03 10:18:25 +0000 (Wed, 03 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow xprofile fields to be moved between groups.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofileadminjsadminjs">trunk/bp-xprofile/admin/js/admin.js</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofileadminjsadminjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/admin/js/admin.js (2800 => 2801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/admin/js/admin.js 2010-03-03 10:09:59 UTC (rev 2800)
+++ trunk/bp-xprofile/admin/js/admin.js 2010-03-03 10:18:25 UTC (rev 2801)
</span><span class="lines">@@ -131,13 +131,15 @@
</span><span class="cx"> opacity: 0.6,
</span><span class="cx"> items: 'tr',
</span><span class="cx"> cancel: 'tr.nodrag',
</span><ins>+ connectWith: 'table.field-group tbody',
</ins><span class="cx"> tolerance: 'pointer',
</span><span class="cx"> update: function() {
</span><span class="cx"> jQuery.post( ajaxurl, {
</span><span class="cx"> action: 'xprofile_reorder_fields',
</span><span class="cx"> 'cookie': encodeURIComponent(document.cookie),
</span><span class="cx"> '_wpnonce_reorder_fields': jQuery("input#_wpnonce_reorder_fields").val(),
</span><del>- 'field_order': jQuery(this).sortable('serialize')
</del><ins>+ 'field_order': jQuery(this).sortable('serialize'),
+ 'field_group_id': jQuery(this).parents('table[id]').attr('id')
</ins><span class="cx"> },
</span><span class="cx"> function(response){});
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (2800 => 2801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2010-03-03 10:09:59 UTC (rev 2800)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2010-03-03 10:18:25 UTC (rev 2801)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> if ( $groups ) :
</span><span class="cx"> foreach ( $groups as $group ) { ?>
</span><span class="cx">
</span><del>- <table id="group_<?php echo $group->id;?>" class="widefat field-group sortable">
</del><ins>+ <table id="<?php echo $group->id;?>" class="widefat field-group sortable">
</ins><span class="cx"> <thead>
</span><span class="cx"> <tr class="grabber">
</span><span class="cx"> <th scope="col" width="10"><img src="<?php echo BP_PLUGIN_URL ?>/bp-xprofile/admin/images/move.gif" alt="<?php _e( 'Drag', 'buddypress' ) ?>" /></th>
</span><span class="lines">@@ -308,9 +308,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> parse_str( $_POST['field_order'], $order );
</span><ins>+ $field_group_id = $_POST['field_group_id'];
</ins><span class="cx">
</span><span class="cx"> foreach ( (array) $order['field'] as $position => $field_id )
</span><del>- xprofile_update_field_position( (int) $field_id, (int) $position );
</del><ins>+ xprofile_update_field_position( (int) $field_id, (int) $position, (int) $field_group_id );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_xprofile_reorder_fields', 'xprofile_ajax_reorder_fields' );
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (2800 => 2801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2010-03-03 10:09:59 UTC (rev 2800)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2010-03-03 10:18:25 UTC (rev 2801)
</span><span class="lines">@@ -471,13 +471,13 @@
</span><span class="cx"> return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s", $field_name ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function update_position( $field_id, $position ) {
</del><ins>+ function update_position( $field_id, $position, $field_group_id ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !is_numeric( $position ) )
</del><ins>+ if ( !is_numeric( $position ) || !is_numeric( $field_group_id ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET field_order = %d WHERE id = %d", $position, $field_id ) );
</del><ins>+ return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET field_order = %d, group_id = %d WHERE id = %d", $position, $field_group_id, $field_id ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* ADMIN AREA HTML. TODO: Get this out of here. */
</span></span></pre>
</div>
</div>
</body>
</html>