Merge 17cffa7528 into 97cbaac5d9

This reverts commit 92604cfe6d.

src/components/TagsManager.vue

@@ -197,7 +197,7 @@ export default {
             return tagOptions;
         },
         selectedTags() {
-            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.id === tag.id));
+            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.tag_id === tag.tag_id));
         },
         colorOptions() {
             return colorOptions(this);

src/pages/List.vue

@@ -11,6 +11,18 @@ export default {
     components: {
         MonitorList,
     },
+    watch: {
+        "$root.isMobile"(newVal) {
+            if (!newVal && this.$route.path === "/list") {
+                this.$router.replace({ path: "/dashboard" });
+            }
+        },
+    },
+    mounted() {
+        if (!this.$root.isMobile && this.$route.path === "/list") {
+            this.$router.replace({ path: "/dashboard" });
+        }
+    },
 };
 </script>
 
@@ -20,5 +32,4 @@ export default {
 .shadow-box {
     padding: 20px;
 }
-
 </style>