Mercurial > gemma

changeset 2683:4d460b2b439f import-overview-rework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged defaut into import-overview-rework branch.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 15 Mar 2019 12:29:49 +0100
parents 9a493d27bf3f (current diff) bd615f978164 (diff)
children 39a05f8c34e6
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Sidebar.vue	Fri Mar 15 12:29:12 2019 +0100
+++ b/client/src/components/Sidebar.vue	Fri Mar 15 12:29:49 2019 +0100
@@ -204,7 +204,7 @@
     updateIndicators() {
       if (this.isWaterwayAdmin) {
         this.$store;
-        HTTP.get("/imports?states=pending", {
+        HTTP.get("/imports?states=pending&count=true", {
           headers: { "X-Gemma-Auth": localStorage.getItem("token") }
         })
           .then(response => {
--- a/schema/install-db.sh	Fri Mar 15 12:29:12 2019 +0100
+++ b/schema/install-db.sh	Fri Mar 15 12:29:49 2019 +0100
@@ -158,7 +158,7 @@
   echo "Really drop database '$db' and all gemma roles? [type 'yes']: "
   read a
   if [[ $a == "yes" ]] ; then
-    dropdb -p "$port" "$db"
+    dropdb --if-exists -p "$port" "$db"
     psql -p $port -A -t -c '\du' | awk -F '|' -v port=$port \
         '$1 "." $3 ~ /waterway_user|waterway_admin|sys_admin|metamorph/ \
 	    { system("dropuser -p " port " \"" $1 "\"") }'