Mercurial > gemma

changeset 2024:6d9fbc62c5a6 unify_imports

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved stretch import to imports file.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 24 Jan 2019 17:38:31 +0100
parents fc5c888428c8
children 070ac9dd61a1
files pkg/models/imports.go pkg/models/stretch.go
diffstat 2 files changed, 14 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/models/imports.go	Thu Jan 24 17:36:57 2019 +0100
+++ b/pkg/models/imports.go	Thu Jan 24 17:38:31 2019 +0100
@@ -131,4 +131,18 @@
 		// Attributes are optional attributes.
 		Attributes common.Attributes `json:"attributes,omitempty"`
 	}
+
+	StretchImport struct {
+		Name      string          `json:"name"`
+		From      Isrs            `json:"from"`
+		To        Isrs            `json:"to"`
+		ObjNam    string          `json:"objnam"`
+		NObjNam   *string         `json:"nobjnam"`
+		Source    string          `json:"source-organization"`
+		Date      Date            `json:"date-info"`
+		Countries UniqueCountries `json:"countries"`
+
+		SendEmail  bool              `json:"send-email"`
+		Attributes common.Attributes `json:"attributes,omitempty"`
+	}
 )
--- a/pkg/models/stretch.go	Thu Jan 24 17:36:57 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-// This is Free Software under GNU Affero General Public License v >= 3.0
-// without warranty, see README.md and license for details.
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-// License-Filename: LICENSES/AGPL-3.0.txt
-//
-// Copyright (C) 2018 by via donau
-//   – Österreichische Wasserstraßen-Gesellschaft mbH
-// Software engineering by Intevation GmbH
-//
-// Author(s):
-//  * Sascha L. Teichmann <sascha.teichmann@intevation.de>
-
-package models
-
-import "gemma.intevation.de/gemma/pkg/common"
-
-type StretchImport struct {
-	Name      string          `json:"name"`
-	From      Isrs            `json:"from"`
-	To        Isrs            `json:"to"`
-	ObjNam    string          `json:"objnam"`
-	NObjNam   *string         `json:"nobjnam"`
-	Source    string          `json:"source-organization"`
-	Date      Date            `json:"date-info"`
-	Countries UniqueCountries `json:"countries"`
-
-	SendEmail  bool              `json:"send-email"`
-	Attributes common.Attributes `json:"attributes,omitempty"`
-}