Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rb045886e86cb40c9f12c589a7e1000ec3c89177a -r902805bed6b4429c736cf807216c15cf61939eb7 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rb045886e86cb40c9f12c589a7e1000ec3c89177a -r902805bed6b4429c736cf807216c15cf61939eb7 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as =================================================================== diff -u -rb3d9e6021b71dcb7f55a13a2508e80a21141baf9 -r902805bed6b4429c736cf807216c15cf61939eb7 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as (.../ConditionMatchingDialog.as) (revision b3d9e6021b71dcb7f55a13a2508e80a21141baf9) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as (.../ConditionMatchingDialog.as) (revision 902805bed6b4429c736cf807216c15cf61939eb7) @@ -115,16 +115,16 @@ branches_lst.hScrollPolicy = "on"; branches_lst.maxHPosition = 200; - var column_sequence:DataGridColumn = new DataGridColumn("sequenceName"); - column_sequence.headerText = Dictionary.getValue("branch_mapping_dlg_branch_col_lbl"); - column_sequence.width = match_dgd.width/2; - var column_condition:DataGridColumn = new DataGridColumn("displayName"); column_condition.headerText = Dictionary.getValue("branch_mapping_dlg_condition_col_lbl"); column_condition.width = match_dgd.width/2; - match_dgd.addColumn(column_sequence); + var column_sequence:DataGridColumn = new DataGridColumn("sequenceName"); + column_sequence.headerText = Dictionary.getValue("branch_mapping_dlg_branch_col_lbl"); + column_sequence.width = match_dgd.width/2; + match_dgd.addColumn(column_condition); + match_dgd.addColumn(column_sequence); var mappings:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).toolBased; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as =================================================================== diff -u -r6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1 -r902805bed6b4429c736cf807216c15cf61939eb7 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision 6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision 902805bed6b4429c736cf807216c15cf61939eb7) @@ -112,17 +112,17 @@ branches_lst.hScrollPolicy = "on"; branches_lst.maxHPosition = 200; + + var column_name:DataGridColumn = new DataGridColumn("groupName"); + column_name.headerText = Dictionary.getValue("branch_mapping_dlg_group_col_lbl"); + column_name.width = match_dgd.width/2; var column_sequence:DataGridColumn = new DataGridColumn("sequenceName"); column_sequence.headerText = Dictionary.getValue("branch_mapping_dlg_branch_col_lbl"); column_sequence.width = match_dgd.width/2; - var column_name:DataGridColumn = new DataGridColumn("groupName"); - column_name.headerText = Dictionary.getValue("branch_mapping_dlg_group_col_lbl"); - column_name.width = match_dgd.width/2; - - match_dgd.addColumn(column_sequence); match_dgd.addColumn(column_name); + match_dgd.addColumn(column_sequence); var mappings:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).groupBased;