From f48abe01ddf84c94ecac8c23b80826b9554304fb Mon Sep 17 00:00:00 2001
From: Eduardo humberto <eduardo.humberto1992@gmail.com>
Date: Thu, 15 Mar 2018 09:38:08 -0300
Subject: [PATCH] remove console log from items list and fix showing items
 label

---
 src/admin/pages/lists/items-page.vue           | 15 +++++++++++++--
 src/classes/filter-types/taginput/Taginput.vue | 12 +++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index 6ed41e002..4be341a6b 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -46,8 +46,8 @@
                 <div class="table-footer">
                     <div class="shown-items">
                         {{ 
-                            $i18n.get('info_showing_items') + 
-                            (itemsPerPage*(page - 1) + 1) + 
+                            $i18n.get('info_showing_items') +
+                            getFirstItem() +
                             $i18n.get('info_to') + 
                             getLastItemNumber() + 
                             $i18n.get('info_of') + totalItems + '.'
@@ -100,6 +100,11 @@ export default {
             isLoading: false
         }
     },
+    watch: {
+        page( value ){
+            this.page = ( value > 0 ) ? value : 1;
+        }
+    },
     components: {
         ItemsList,
         FiltersItemsList
@@ -185,6 +190,12 @@ export default {
             let last = (Number(this.itemsPerPage*(this.page - 1)) + Number(this.itemsPerPage));
             
             return last > this.totalItems ? this.totalItems : last;
+        },
+        getFirstItem(){
+            if( this.totalItems == 0 )
+                return 0;
+
+            return ( this.itemsPerPage * ( this.page - 1 ) + 1)
         }
     },
     computed: {
diff --git a/src/classes/filter-types/taginput/Taginput.vue b/src/classes/filter-types/taginput/Taginput.vue
index 471ccff7a..34f3b0bd0 100644
--- a/src/classes/filter-types/taginput/Taginput.vue
+++ b/src/classes/filter-types/taginput/Taginput.vue
@@ -99,12 +99,14 @@
             getValuesPlainText( field_id ){
                 return axios.get( '/collection/' + this.collection  + '/fields/' + field_id + '?fetch=all_field_values')
                     .then( res => {
-                        for (let metadata of res.data) {
-                            let index = this.options.findIndex(itemMetadata => itemMetadata.value === metadata.mvalue);
-                            if( index < 0 ){
-                                this.options.push({ label: metadata.mvalue, value: metadata.mvalue })
-                            }
+                        if( res.data ){
+                            for (let metadata of res.data) {
+                                let index = this.options.findIndex(itemMetadata => itemMetadata.value === metadata.mvalue);
+                                if( index < 0 ){
+                                    this.options.push({ label: metadata.mvalue, value: metadata.mvalue })
+                                }
 
+                            }
                         }
                     })
                     .catch(error => {