Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

front/core/components/popover/popover.js

@@ -77,8 +77,8 @@ export default class Popover extends Component {
         let isDescriptorMoreMenu = parent && parent.attributes[0].nodeValue == 'more-button';
         let leftMenu = this.document.querySelector('div[class="menu left"]');
         if (isDescriptorMoreMenu && leftMenu) {
+            let descriptorDiv = this.document.querySelector('vn-side-menu div[class="vn-descriptor"]');
             let leftMenuWidth = leftMenu.offsetWidth;
-            let descriptorDiv = this.document.querySelector('vn-side-menu div');
 
             let descriptorWidth = descriptorDiv.offsetWidth;
             this.scrollbarWidth = leftMenuWidth - descriptorWidth;

modules/ticket/front/descriptor/index.html

@@ -168,13 +168,14 @@
 </vn-confirm>
 <vn-dialog
     vn-id="changeShippedDialog"
+    on-open="$ctrl.focusInput()"
     on-response="$ctrl.changeShipped(response)">
     <tpl-body>
         <div>
             <h5 style="text-align: center">
                 <span translate>Change shipped hour</span>
             </h5>
-            <vn-input-time vn-one model="$ctrl.newShipped" label="Shipped hour"></vn-input-time>
+            <vn-input-time vn-id="newShipped" vn-one model="$ctrl.newShipped" label="Shipped hour"></vn-input-time>
         </div>
     </tpl-body>
     <tpl-buttons>

modules/ticket/front/descriptor/index.js

@@ -297,6 +297,10 @@ class Controller {
             );
         }
     }
+
+    focusInput() {
+        this.$scope.newShipped.focus();
+    }
 }
 
 Controller.$inject = ['$state', '$scope', '$http', 'vnApp', '$translate', 'aclService'];