Index: branches/5.2.x/core/units/relationship/relationship_config.php =================================================================== diff -u -N -r13840 -r14092 --- branches/5.2.x/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 13840) +++ branches/5.2.x/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 14092) @@ -1,6 +1,6 @@ true, 'AutoClone' => true, - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_recip','show_oneway'), 'type' => WHERE_FILTER), - ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ), - 's1' => Array(), - 'show_recip' => Array('label' => 'la_Reciprocal', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ), - 'show_oneway' => Array('label' => 'la_OneWay', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ), - ) - ), + 'CalculatedFields' => Array ( + '' => Array ( + 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', + 'ItemType' => '#ITEM_TYPES#', + ), + ), - 'CalculatedFields' => Array( - '' => Array( - 'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))', - 'ItemType' => '#ITEM_TYPES#', - ), - ), - 'ListSQLs' => Array( ''=> 'SELECT %1$s.RelationshipId, %1$s.Priority, %1$s.Type, %1$s.Enabled %2$s FROM %1$s #ITEM_JOIN#', ), // key - special, value - list select sql @@ -98,8 +84,8 @@ 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), ), 'VirtualFields' => Array( - 'ItemName' => Array(), - 'ItemType' => Array(), + 'ItemName' => Array ('type' => 'string', 'default' => ''), + 'ItemType' => Array ('type' => 'string', 'default' => ''), ), 'Grids' => Array(