Merge branch 'devel'

cmd/backend/config.go

@@ -52,7 +52,7 @@ func newConfig() *Config {
 		PDFDir:          "/var/www/cpolis/pdfs",
 		PicsDir:         "/var/www/cpolis/pics",
 		Port:            ":8080",
-		Version:         "v0.14.1",
+		Version:         "v0.14.0",
 		WebDir:          "/var/www/cpolis/web",
 	}
 }

cmd/frontend/articles.go

@@ -78,7 +78,6 @@ func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 		data.Creator = data.ArticleUsers[fmt.Sprint(creator.LastName, creator.FirstName, creator.ID)]
-		data.Creator.ArticleRole = Author
 		delete(data.ArticleUsers, fmt.Sprint(creator.LastName, creator.FirstName, creator.ID))
 
 		data.Tags, err = db.GetTagList()
@@ -156,10 +155,10 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			}
 		}
 
-		if r.PostFormValue("creator") == "author" {
+		if r.PostFormValue("creator") == "contributor" {
-			authors = append(authors, article.CreatorID)
-		} else {
 			contributors = append(contributors, article.CreatorID)
+		} else {
+			authors = append(authors, article.CreatorID)
 		}
 		if len(authors) == 0 {
 			http.Error(w, "Es muss mindestens einen Autor geben.", http.StatusBadRequest)
@@ -275,10 +274,10 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			}
 		}
 
-		if r.PostFormValue("creator") == "author" {
+		if r.PostFormValue("creator") == "contributor" {
-			authors = append(authors, article.CreatorID)
-		} else {
 			contributors = append(contributors, article.CreatorID)
+		} else {
+			authors = append(authors, article.CreatorID)
 		}
 		if len(authors) == 0 {
 			http.Error(w, "Es muss mindestens einen Autor geben.", http.StatusBadRequest)

cpolis.service

@@ -1,14 +1,9 @@
 [Unit]
 Description=cpolis
-After=network.target
 
 [Service]
 ExecStart=/usr/local/bin/cpolis
-User=cpolis
+Restart=on-failure
-Group=cpolis
-Restart=always
-RestartSec=2s
-Type=simple
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target

web/templates/editor.html

@@ -75,9 +75,9 @@
     </div>
 
     <div>
-        <input id="creator" name="creator" type="checkbox" value="author" {{if eq .Creator.ArticleRole
+        <input id="creator" name="creator" type="checkbox" value="contributor" {{if eq .Creator.ArticleRole
-            1}}checked{{end}} />
+            2}}checked{{end}} />
-        <label for="creator">Ich bin Autor.</label>
+        <label for="creator">Ich bin nicht der Autor.</label>
     </div>
 
     <div class="btn-area">