Changeset 8535

Timestamp:

06/16/2014 07:30:37 PM (12 years ago)

Author:

boonebgorges

Message:

Record 'option_order' when passed through xprofile_insert_field()

Previously, this value was not recorded in the main part of BP_XProfile_Field.
Instead, the requisite option_order checking only happened when a parent field
was being saved via the UI.

Fixes #5472

Location:

trunk

Files:

• src/bp-xprofile/bp-xprofile-classes.php (modified) (2 diffs)
• tests/phpunit/testcases/xprofile/functions.php (modified) (1 diff)

trunk/src/bp-xprofile/bp-xprofile-classes.php

@@ -636 +636 @@
                 $this->order_by    = apply_filters( 'xprofile_field_order_by_before_save',    $this->order_by,    $this->id );
                 $this->field_order = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
+                $this->option_order = apply_filters( 'xprofile_field_option_order_before_save', $this->option_order, $this->id );
                 $this->can_delete  = apply_filters( 'xprofile_field_can_delete_before_save',  $this->can_delete,  $this->id );
                 $this->type_obj    = bp_xprofile_create_field_type( $this->type );
@@ -642 +643 @@
 
                 if ( $this->id != null ) {
-                        $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d, can_delete = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->can_delete, $this->id );
+                        $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d, option_order = %d, can_delete = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->option_order, $this->can_delete, $this->id );
                 } else {
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order, can_delete ) VALUES (%d, %d, %s, %s, %s, %d, %s, %d, %d )", $this->group_id, $this->parent_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->can_delete );
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order, option_order, can_delete ) VALUES (%d, %d, %s, %s, %s, %d, %s, %d, %d, %d )", $this->group_id, $this->parent_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->option_order, $this->can_delete );
                 }
 

trunk/tests/phpunit/testcases/xprofile/functions.php

@@ -591 +591 @@
                 $this->assertNotEmpty( $f );
         }
+
+        /**
+         * @group xprofile_insert_field
+         */
+        public function test_xprofile_insert_field_type_option_option_order() {
+                $g = $this->factory->xprofile_group->create();
+                $parent = $this->factory->xprofile_field->create( array(
+                        'field_group_id' => $g,
+                        'type' => 'selectbox',
+                        'name' => 'Parent',
+                ) );
+
+                $f = xprofile_insert_field( array(
+                        'field_group_id' => $g,
+                        'parent_id' => $parent,
+                        'type' => 'option',
+                        'name' => 'Option 1',
+                        'option_order' => 5,
+                ) );
+
+                $field = new BP_XProfile_Field( $f );
+
+                $this->assertEquals( 5, $field->option_order );
+        }
 }