Index: branches/RC/core/units/relationship/relationship_config.php =================================================================== diff -u -r11892 -r11902 --- branches/RC/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 11892) +++ branches/RC/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 11902) @@ -1,6 +1,6 @@ Array('type'=>'int', 'required' => 1, 'default' => NULL), 'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0), 'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0), - 'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter', 'required' => 1, 'options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'),'not_null'=>1,'default'=>0,'use_phrases'=>1), - 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1), + 'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter', 'required' => 1, 'options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'), 'not_null'=>1,'default'=>0,'use_phrases'=>1), + 'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'), 'not_null' => 1, 'default'=>1, 'use_phrases'=>1), 'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0), ), - 'VirtualFields' => Array( 'ItemName' => Array(), + 'VirtualFields' => Array( + 'ItemName' => Array(), 'ItemType' => Array(), ), 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'RelationshipId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'ItemType' => Array( 'title'=>'la_col_TargetType', 'filter_block' => 'grid_like_filter'), - 'Type' => Array( 'title'=>'la_col_RelationshipType', 'filter_block' => 'grid_options_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), - ), - - ), - ), + 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used + 'Fields' => Array( + 'RelationshipId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'), + 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), + 'ItemType' => Array( 'title'=>'la_col_TargetType', 'filter_block' => 'grid_like_filter'), + 'Type' => Array( 'title'=>'la_col_RelationshipType', 'filter_block' => 'grid_options_filter'), + 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), + ), + ), + ), ); \ No newline at end of file