Mercurial > gemma

changeset 2416:706121185e63 staging_consolidation

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wip
author Thomas Junk <thomas.junk@intevation.de>
date Thu, 28 Feb 2019 13:46:09 +0100
parents df56bc53e86d
children e02abe7f16c2
files client/src/components/Sidebar.vue client/src/router.js
diffstat 2 files changed, 1 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Sidebar.vue	Thu Feb 28 13:33:46 2019 +0100
+++ b/client/src/components/Sidebar.vue	Thu Feb 28 13:46:09 2019 +0100
@@ -28,7 +28,7 @@
           <span class="fix-trans-space" v-translate>Bottlenecks</span>
         </router-link>
         <div v-if="isWaterwayAdmin">
-          <router-link to="/review" class="position-relative">
+          <router-link to="/imports/overview" class="position-relative">
             <font-awesome-icon
               class="fa-fw mr-2"
               fixed-width
@@ -40,19 +40,6 @@
             </span>
           </router-link>
         </div>
-        <div v-if="isWaterwayAdmin">
-          <router-link to="/imports/overview" class="position-relative">
-            <font-awesome-icon
-              class="fa-fw mr-2"
-              fixed-width
-              icon="clipboard-check"
-            ></font-awesome-icon>
-            <span class="fix-trans-space" v-translate>Staging area</span>(new)
-            <span class="indicator" v-if="showSidebar && staging.length">
-              {{ staging.length }}
-            </span>
-          </router-link>
-        </div>
         <div v-if="isSysAdmin">
           <router-link to="/stretches">
             <font-awesome-icon
@@ -139,16 +126,6 @@
             <span class="fix-trans-space" v-translate>Logs</span>
           </router-link>
         </div>
-        <div v-if="isWaterwayAdmin">
-          <router-link to="/importqueue">
-            <font-awesome-icon
-              class="fa-fw mr-2"
-              fixed-width
-              icon="tasks"
-            ></font-awesome-icon>
-            <span class="fix-trans-space" v-translate>Importqueue</span>
-          </router-link>
-        </div>
         <hr class="m-0" />
         <a @click="logoff" href="#" class="logout">
           <font-awesome-icon
--- a/client/src/router.js	Thu Feb 28 13:33:46 2019 +0100
+++ b/client/src/router.js	Thu Feb 28 13:46:09 2019 +0100
@@ -81,22 +81,6 @@
       }
     },
     {
-      path: "/importqueue/:id?",
-      name: "importqueue",
-      component: () => import("./components/importqueue/Importqueue.vue"),
-      meta: {
-        requiresAuth: true
-      },
-      beforeEnter: (to, from, next) => {
-        const isWaterwayAdmin = store.getters["user/isWaterwayAdmin"];
-        if (!isWaterwayAdmin) {
-          next("/");
-        } else {
-          next();
-        }
-      }
-    },
-    {
       path: "/importsoundingresults",
       name: "importsoundingresults",
       component: () => import("./components/ImportSoundingresults.vue"),
@@ -191,26 +175,6 @@
       }
     },
     {
-      path: "/review/:id?",
-      name: "review",
-      component: Main,
-      meta: {
-        requiresAuth: true
-      },
-      beforeEnter: (to, from, next) => {
-        const isWaterwayAdmin = store.getters["user/isWaterwayAdmin"];
-        if (!isWaterwayAdmin) {
-          next("/");
-        } else {
-          store.commit("application/searchQuery", "");
-          store.commit("application/showContextBox", true);
-          store.commit("application/contextBoxContent", "staging");
-          store.commit("application/showSearchbar", true);
-          next();
-        }
-      }
-    },
-    {
       path: "/imports/overview/:id?",
       name: "importoverview",
       component: Main,