Merge branch 'dev' into 3281-entry_buys_new

2021-11-16 08:20:01 +00:00 · 2021-11-16 08:20:01 +00:00 · 6c02eca6cd
parent 3f6e1ce9aa 5b22892500
commit 6c02eca6cd
2 changed files with 5 additions and 1 deletions
--- a/modules/item/front/fixed-price-search-panel/index.html
+++ b/modules/item/front/fixed-price-search-panel/index.html
@ -44,7 +44,7 @@
            <vn-autocomplete 
                vn-one
                ng-model="filter.buyerFk"
-                url="Workers/activeWithRolee"
+                url="Workers/activeWithRole"
                show-field="nickname"
                search-function="{firstName: $search}"
                value-field="id"
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@ -154,6 +154,10 @@
                ng-click="model.insert()">
            </vn-icon-button>
        </div>
+        <vn-pagination
+            model="model"
+            class="vn-pt-md">
+        </vn-pagination>
    </vn-card>
 </div>
 <vn-item-descriptor-popover