Merge pull request #34 from 1312inc/dev

version 3.7.1: minor bug fixes
1312inc · Dec 24, 2020 · 9abd4c6 · 9abd4c6
2 parents 7dbbbea + 29e6291
commit 9abd4c6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/css/pocketlists.css b/css/pocketlists.css
@@ -657,7 +657,7 @@ i.pl-list-color-indicator { display: inline-block; background-image: none; borde
 .s-order #pl-complete-log { display: block; }
 .s-order #pl-complete-log ul.menu-v { margin-top: 10px; }
 
-.t-tasks-wrapper .pl-items { margin-top: 1rem; margin-bottom: 2rem; }
+.t-tasks-wrapper .pl-items { margin-top: 1rem; margin-bottom: 2rem; z-index: 1; }
 .t-tasks-wrapper .pl-items .fields { width: 100%; }
 .t-tasks-wrapper .pl-items .pl-link-preview.pl-link-app-tasks { display: none !important; }
 .t-tasks-wrapper .pl-items .pl-item-drag-handle { display: none !important; }

diff --git a/js/pocketlists-item.js b/js/pocketlists-item.js
@@ -1596,6 +1596,10 @@ $.pocketlists.Items = function ($list_items_wrapper, options) {
             source: function (request, response) {
                 var term = canShowAutocomplete();
 
+                if (term === false) {
+                    return;
+                }
+
                 if (term === '') {
                     return response([{
                         'value': '',
@@ -1675,11 +1679,12 @@ $.pocketlists.Items = function ($list_items_wrapper, options) {
 
         // old jq ui hack
         if ($textarea.data("ui-autocomplete") !== undefined) {
+            debugger;
             $textarea.data("ui-autocomplete")._renderItem = function (ul, item) {
                 return $("<li>")
-                    .append(item.label)
+                    .append($(item.label).addClass('ui-menu-item-wrapper'))
                     .appendTo(ul);
-            };
+            }
         }
 
         $textarea

diff --git a/lib/class/AppLink/pocketlistsAppLinkShop.class.php b/lib/class/AppLink/pocketlistsAppLinkShop.class.php
@@ -103,7 +103,7 @@ protected function autocompleteOrder($term, $params = [], $count)
      */
     public function getLinkUrl(pocketlistsItemLink $itemLink)
     {
-        return sprintf('%s#/orders/id=%s/', wa()->getAppUrl('shop'), $itemLink->getEntityId());
+        return sprintf('%s?action=orders#/order/%s/', wa()->getAppUrl('shop'), $itemLink->getEntityId());
     }
 
     /**

diff --git a/lib/config/app.php b/lib/config/app.php
@@ -7,7 +7,7 @@
             48 => 'img/pl2webasyst48.png',
             96 => 'img/pl2webasyst96.png',
         ),
-    'version'        => '3.7.0',
+    'version'        => '3.7.1',
     'vendor'         => '1021997',
     'frontend'       => true,
     'routing_params' => array(