changeset 4201:e564ea0ee095 stylesconfig

merge default into stylesconfig
author Fadi Abbud <fadi.abbud@intevation.de>
date Wed, 14 Aug 2019 09:17:59 +0200
parents 5cee71c929d1 (current diff) dc435fbb2d7a (diff)
children e24b220cef64
files
diffstat 3 files changed, 18 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/sections/Sections.vue	Fri Aug 09 09:51:46 2019 +0200
+++ b/client/src/components/sections/Sections.vue	Wed Aug 14 09:17:59 2019 +0200
@@ -205,10 +205,21 @@
           label: this.$gettext("Delete"),
           icon: "trash",
           callback: () => {
-            displayInfo({
-              title: this.$gettext("Not implemented"),
-              message: this.$gettext("Deleting ") + section.id
-            });
+            HTTP.post("/imports/dsec",
+              {
+                id: section.id.split(".")[1]*1
+              },
+              {
+                headers: { "X-Gemma-Auth": localStorage.getItem("token") }
+              }
+            )
+              .then(response => {
+
+                displayInfo({
+                  title: this.$gettext("Staging Area"),
+                  message: this.$gettext("Deleting ") + section.properties.objnam
+                });
+              })
           }
         },
         cancel: {
--- a/pkg/controllers/routes.go	Fri Aug 09 09:51:46 2019 +0200
+++ b/pkg/controllers/routes.go	Wed Aug 14 09:17:59 2019 +0200
@@ -83,7 +83,7 @@
 		Handle: getSystemSettings,
 	})).Methods(http.MethodGet)
 
-	api.Handle("/system/settings", any(&JSONHandler{
+	api.Handle("/system/settings", sysAdmin(&JSONHandler{
 		Input:  func(*http.Request) interface{} { return &map[string]string{} },
 		Handle: setSystemSettings,
 	})).Methods(http.MethodPut)
--- a/pkg/imports/dsec.go	Fri Aug 09 09:51:46 2019 +0200
+++ b/pkg/imports/dsec.go	Wed Aug 14 09:17:59 2019 +0200
@@ -87,7 +87,7 @@
 	defer tx.Rollback()
 
 	var found bool
-	if err := tx.QueryRowContext(ctx, dsecExistsSQL, dsec.ID).Scan(dsec.ID); err != nil {
+	if err := tx.QueryRowContext(ctx, dsecExistsSQL, dsec.ID).Scan(&found); err != nil {
 		return nil, err
 	}
 
@@ -101,9 +101,9 @@
 		ctx,
 		trackImportDeletionSQL,
 		importID,
-		true,
 		"waterway.sections",
 		dsec.ID,
+		true,
 	); err != nil {
 		return nil, err
 	}