Correcciones de estilo

sedici · Mar 16, 2016 · c240475 · c240475
1 parent 1aa9146
commit c240475
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/Celsius3/CoreBundle/Resources/public/ng/AdminOrder/controllers.js b/src/Celsius3/CoreBundle/Resources/public/ng/AdminOrder/controllers.js
@@ -637,15 +637,6 @@ orderControllers.controller('OrderCtrl', function ($scope, $http, Upload, $filte
         });
     };
 
-    $scope.validateInstitution = function () {
-        if (!_.isEmpty(findInstitution($scope.select.tree))) {
-            $scope.ccierror = '';
-            $scope.submitInstitution();
-        } else {
-            $scope.ccierror = 'has-error';
-        }
-    };
-
     $scope.submitInstitution = function () {
         var parent_institution = findInstitution($scope.select.tree);
 
@@ -673,9 +664,7 @@ orderControllers.controller('OrderCtrl', function ($scope, $http, Upload, $filte
                     $('#institutionForm div.form-group').has('input').each(function () {
                         $(this).removeClass('has-error');
                     });
-                    console.log(response.errors);
                     $(response.errors).each(function () {
-                        console.log($(this).get(0));
                         $('#institutionForm div.form-group')
                                 .has('input[name="institution[' + $(this).get(0).property_path + ']"]')
                                 .addClass('has-error')
@@ -712,7 +701,6 @@ orderControllers.controller('OrderCtrl', function ($scope, $http, Upload, $filte
                     });
 
                     $(response.errors).each(function () {
-                        console.log($(this).get(0));
                         $('#journalForm div.form-group')
                                 .has('input[name="journal[' + $(this).get(0).property_path + ']"]')
                                 .addClass('has-error')

diff --git a/src/Celsius3/CoreBundle/Resources/views/AdminOrder/show.html.twig b/src/Celsius3/CoreBundle/Resources/views/AdminOrder/show.html.twig
@@ -24,7 +24,7 @@
             {% verbatim %}
                 <label for="search">{{'search' | translate}}:</label>
                 <input type="text" name="search" id="search" ng-change="searchCatalog(catalogSearch)" ng-model="catalogSearch" />
-                <button class="btn btn-sm btn-default pull-right" data-toggle="popover" data-placement="left" data-content="{{ getHtmlMaterialData() }}" data-html=true data-container="body">
+                <button class="btn btn-sm btn-default pull-right"  data-auto-close="1" data-placement="left" bs-popover data-content-template="show_material_data.html?{{assets_version}}"  data-container="body">
                 {{ 'orderData' | translate }}
                 </button>
                 <hr>
@@ -843,7 +843,7 @@
                 </div>
                 <div class="modal-footer">
                 <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">{{'close' | translate}}</button>
-                <button class="btn btn-primary" ng-click="validateInstitution()" value="#institutionForm">{{'save' | translate}}</button>
+                <button class="btn btn-primary" ng-click="submitInstitution()" value="#institutionForm">{{'save' | translate}}</button>
                 </div>
                 </div>
                 </div>