Se resuelve bug donde no funcionaba el boton cancelar y no se mostraba el...

Se resuelve bug donde no funcionaba el boton cancelar y no se mostraba el modal al eliminar contrato

front/.settings/org.eclipse.wst.common.component

 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                
+                    
+    
     
     
     <wb-module deploy-name="dla">
-                                
+                                        
         
         
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                
         
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+                                        
         
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                
         
         
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                        
-        
-        <dependent-module archiveName="servicios-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/servicios/servicios">
-                                    
-            
-            <dependency-type>uses</dependency-type>
-                                
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+                                        
         
-        </dependent-module>
-                        
         
-        <dependent-module archiveName="persistencia-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/persistencia/persistencia">
-                                    
-            
-            <dependency-type>uses</dependency-type>
-                                
         
-        </dependent-module>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
                         
         
-        <dependent-module archiveName="dominio-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/dominio/dominio">
-                                    
-            
-            <dependency-type>uses</dependency-type>
-                                
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                                        
         
-        </dependent-module>
-                                
         
         
         <property name="context-root" value="dla"/>
-                                
+                                        
+        
         
         
         <property name="java-output-path" value="/front/target/classes"/>
-                            
+                                    
+    
     
     
     </wb-module>
-            
+                
+
 
 
 </project-modules>

front/src/main/webapp/design/css/basic.css

@@ -3971,7 +3971,6 @@ input[type="button"].btn-block {
 }
 
 .fade {
-  opacity: 0;
   -webkit-transition: opacity 0.15s linear;
   -o-transition: opacity 0.15s linear;
   transition: opacity 0.15s linear;

front/src/main/webapp/js/dda/contrato/broadview/broadview.js

@@ -327,7 +327,7 @@ function confirm(heading, question, cancelButtonTxt, okButtonTxt, callback) {
 			'<a href="#" id="okButton" class="btn btn-success">' +
 			okButtonTxt +
 			'</a>' +
-			'<a href="#" data-dismiss="modal" class="btn btn-primary">' +
+			'<a href="#" id="cancelButtonMod" data-dismiss="modal" class="btn btn-primary">' +
 			cancelButtonTxt +
 			'</a>' +
 
@@ -341,12 +341,15 @@ function confirm(heading, question, cancelButtonTxt, okButtonTxt, callback) {
 		confirmModal.modal('hide');
 	});
 
+	confirmModal.find('#cancelButtonMod').click(function(event) {
+			confirmModal.modal('hide');
+	});
+	
 	confirmModal.modal('show');
 
 	confirmModal.on('hidden.bs.modal', function() {
 		$(this).remove();
 	});
-
 };
 
 

front/src/main/webapp/js/dda/contrato/generales/validacionesEnGenerales.js

@@ -185,7 +185,7 @@ function confirm(heading, question, cancelButtonTxt, okButtonTxt, callback) {
 			'<a href="#" id="okButton" class="btn btn-success">' +
 			okButtonTxt +
 			'</a>' +
-			'<a href="#" data-dismiss="modal" class="btn btn-primary">' +
+			'<a href="#" id="cancelButtonMod" data-dismiss="modal" class="btn btn-primary">' +
 			cancelButtonTxt +
 			'</a>' +
 
@@ -198,6 +198,10 @@ function confirm(heading, question, cancelButtonTxt, okButtonTxt, callback) {
 		callback();
 		confirmModal.modal('hide');
 	});
+	
+	confirmModal.find('#cancelButtonMod').click(function(event) {
+			confirmModal.modal('hide');
+	});
 
 	confirmModal.modal('show');