Follow up to fix bug where a user can't remove a module - TRUNK-4011

updating to correct version of the messages.properties file
openmrs · Aug 26, 2013 · f412d88 · f412d88
1 parent ae924a9
commit f412d88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/webapp/src/main/webapp/WEB-INF/messages.properties b/webapp/src/main/webapp/WEB-INF/messages.properties
@@ -1966,8 +1966,7 @@ Module.error=Error processing Module
 Module.errorStarting=Error starting Module - {0}
 Module.errorClickForDetails=Error starting! Click for details
 Module.dependencyValidationNotice=Attention. Dependent modules detected !
-Module.dependencyShutdownNotice=The following modules will also be shutdown if you decide to continue with this action.
-Module.dependencyUnloadNotice=The following modules will also be removed from the system if you decide to continue with this action.
+Module.dependencyShutdownNotice=The following modules will be shutdown if you decide to continue with this action.
 Module.invalid=Invalid module specified {0}
 Module.notStarted=Not Started
 Module.loadedAndStarted=Module loaded and started successfully

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp
@@ -31,11 +31,7 @@
 		success : function(data) {
 			if(data != ""){
 				var message;
-				if(isUnloadFlag == false){
-					message = '<openmrs:message code="Module.dependencyShutdownNotice" javaScriptEscape="true"/>';
-				}else{
-					message = '<openmrs:message code="Module.dependencyUnloadNotice" javaScriptEscape="true"/>';
-				}
+				message = '<openmrs:message code="Module.dependencyShutdownNotice" javaScriptEscape="true"/>';				
 				message += '<br/><br/>' + JSON.parse(data);
 				
 				document.getElementById('dependency-confirmation-message').innerHTML = message;
@@ -47,8 +43,13 @@
 			          "Ok": function() {
 			            $j( this ).dialog( "close" );	
 			            
-			            moduleId = escapeSpecialCharacters(moduleId);			                			            
+			            moduleId = escapeSpecialCharacters(moduleId);	
+			            if(isUnloadFlag == false){
 			            $j('#' + moduleId + '-form').append('<input type="hidden" name="stop.x" value="stop.x">');
+			            }else{
+				            $j('#' + moduleId + '-form').append('<input type="hidden" name="unload.x" value="unload.x">');
+     	
+			            }
 						$j('#' + moduleId + '-form').submit();
 			          },
 			          Cancel: function() {			        	  
@@ -57,8 +58,12 @@
 			        }
 			      });
 			}else{
-	            moduleId = escapeSpecialCharacters(moduleId);			                
+	            moduleId = escapeSpecialCharacters(moduleId);	
+	            if(isUnloadFlag == false){
 				$j('#' + moduleId + '-form').append('<input type="hidden" name="stop.x" value="stop.x">');
+	            }else{
+					$j('#' + moduleId + '-form').append('<input type="hidden" name="unload.x" value="unload.x">');
+	            }
 				$j('#' + moduleId + '-form').submit();
 			}
 		}