### Eclipse Workspace Patch 1.0 #P msgcntr Index: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties =================================================================== --- messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties (revision 29609) +++ messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties (working copy) @@ -848,4 +843,5 @@ rank_assign_remove_all=Remove all rank_assign_recipients_selected=recipients selected rank_assign_button_cancel=Cancel rank_assign_button_update=Update Individuals +cdfm_not_selected_topic=You have to select forum and topic where moving thread Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java =================================================================== --- messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java (revision 29609) +++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java (working copy) @@ -9142,6 +9142,10 @@ return gotoMain(); } else { desttopicIdstr = (String) destTopicList.get(0); + if ("0".equals(desttopicIdstr)){ + setErrorMessage(getResourceBundleString(NOT_SELECTED_TOPIC)); + return gotoMain(); + } } if (LOG.isDebugEnabled()) LOG.debug("Calling processMoveThread dest topic is " + desttopicIdstr); @@ -9397,6 +9401,7 @@ private static final String ADD_RANK = "dfAddRank"; private static final String EDIT_RANK = "dfEditRank"; private static final String CONFIRM_REMOVE_RANK = "dfConfirmRemoveRanks"; + private static final String NOT_SELECTED_TOPIC = "cdfm_not_selected_topic"; private boolean just_created = false; private boolean imageDeletePending = false; Index: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties =================================================================== --- messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties (revision 29609) +++ messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties (working copy) @@ -784,36 +784,37 @@ image_size_err=Su imagen es demasiado grande para el espacio de 35 x 35 pixeles. Por favor reduzca su imagen para que ocupe menos de 100KB. rank_assign_err=Seleccione tipo de fila +cdfm_not_selected_topic=Debe elegir el foro y tema al que quiere mover la conversaci\u00F3n.