Merge branch 'spidev' into 'master'

Pop Updates

See merge request fronk/thetool!1953

public/js/pages/Pop/Pop.js

@@ -1,5 +1,6 @@
 Vue.component('Pop', {
     //language=Vue
+    // g
     template: `
       <tt-card>
 
@@ -37,7 +38,7 @@ Vue.component('Pop', {
           </template>
 
           <template v-slot:actions="{ row }">
-            <a :href="window['TT_CONFIG']['BASE_URL'] +'/Pop/edit/?id=' + row.id"><i class="far fa-edit" title="Bearbeiten"></i></a>
+            <a :href="window['TT_CONFIG']['BASE_URL'] +'/Pop/edit/?id=' + row.id +'&returnto=Pop'"><i class="far fa-edit" title="Bearbeiten"></i></a>
             <a v-if="row.folder_link && window.TT_CONFIG.IS_ADMIN === '1'" :href="row.folder_link" target="_blank"><i class="fas fa-folder" title="Ordner"></i></a>
             <a :href="window['TT_CONFIG']['BASE_URL'] +'/Pop/delete/?id=' + row.id" onclick="if(!confirm('Device wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash "></i></a>
           </template>
@@ -55,6 +56,11 @@ Vue.component('Pop', {
                 defaultPageSize: 25,
                 headers: [
                     {text: 'Name', key: 'name', priority: 10},
+                    {text: 'Kategorie', key: 'category', class: 'text-center',  priority: 4, filter: 'select', filterOptions: [
+                            {value: '1', text: 'Outdoor (Kasten/Schrank)'},
+                            {value: '2', text: 'Indoor (Keller Gebäude)'},
+                            {value: '3', text: 'Sender/Funk (Sendemast)'},
+                            {value: '4', text: 'Container (Garage, Container)'}]},
                     {text: 'Netzgebiet', key: 'networkArea', class: 'text-center',
                     // TODO: fix autocomplete Filter
                     //    filter: 'autocomplete',