Merge branch 'develop' into 'master'

Develop See merge request !10

Merge branch 'develop' into 'master'
Develop See merge request !10
Eric Fernandez
2 parents 08f86b7ab2 5897a0b254
Showing 2 changed files Show diff stats
src/js/controller.js
src/js/controllerDetalle.js
@@ -75,7 +75,7 @@ angular.module(&#39;focaActivarHojaRuta&#39;)
                     {
                         ariaLabelledBy: '',
                         templateUrl: 'modal-remitos.html',
-                        controller: 'focaModalDetalleController',
+                        controller: 'focaModalRemitosHojaRutaController',
                         resolve: {
                             hojasRutas: function () { return hojasRutas; },
                         },
 angular.module('focaActivarHojaRuta')
-    .controller('focaModalDetalleController', [
+    .controller('focaModalRemitosHojaRutaController', [
         '$scope', '$timeout', '$uibModalInstance', 'focaModalService',
         'focaActivarHojaRutaService','hojasRutas',
         function ($scope, $timeout, $uibModalInstance, focaModalService,
...	...	@@ -75,7 +75,7 @@ angular.module('focaActivarHojaRuta')
75	75	{
76	76	ariaLabelledBy: '',
77	77	templateUrl: 'modal-remitos.html',
78		- controller: 'focaModalDetalleController',
	78	+ controller: 'focaModalRemitosHojaRutaController',
79	79	resolve: {
80	80	hojasRutas: function () { return hojasRutas; },
81	81	},
1	1	angular.module('focaActivarHojaRuta')
2		- .controller('focaModalDetalleController', [
	2	+ .controller('focaModalRemitosHojaRutaController', [
3	3	'$scope', '$timeout', '$uibModalInstance', 'focaModalService',
4	4	'focaActivarHojaRutaService','hojasRutas',
5	5	function ($scope, $timeout, $uibModalInstance, focaModalService,