Merge branch 'master' into docker-separate-dep

handlers/groups.go

@@ -24,6 +24,21 @@ import (
 	"net/http"
 )
 
+func groupViewHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+
+	var group *core.Group
+	id := vars["id"]
+	group = core.SelectGroup(utils.ToInt(id))
+
+	if group == nil {
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	ExecuteResponse(w, r, "group.gohtml", group, nil)
+}
+
 // apiAllGroupHandler will show all the groups
 func apiAllGroupHandler(w http.ResponseWriter, r *http.Request) {
 	auth := IsUser(r)
@@ -42,6 +57,24 @@ func apiGroupHandler(w http.ResponseWriter, r *http.Request) {
 	returnJson(group, w, r)
 }
 
+// apiGroupUpdateHandler will update a group
+func apiGroupUpdateHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	group := core.SelectGroup(utils.ToInt(vars["id"]))
+	if group == nil {
+		sendErrorJson(errors.New("group not found"), w, r)
+		return
+	}
+	decoder := json.NewDecoder(r.Body)
+	decoder.Decode(&group)
+	_, err := group.Update()
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	sendJsonAction(group, "update", w, r)
+}
+
 // apiCreateGroupHandler accepts a POST method to create new groups
 func apiCreateGroupHandler(w http.ResponseWriter, r *http.Request) {
 	var group *core.Group

handlers/routes.go

@@ -87,10 +87,13 @@ func Router() *mux.Router {
 	r.Handle("/service/{id}/edit", authenticated(servicesViewHandler, true)).Methods("GET")
 	r.Handle("/service/{id}/delete_failures", authenticated(servicesDeleteFailuresHandler, true)).Methods("GET")
 
+	r.Handle("/group/{id}", http.HandlerFunc(groupViewHandler)).Methods("GET")
+
 	// API GROUPS Routes
 	r.Handle("/api/groups", readOnly(apiAllGroupHandler, false)).Methods("GET")
 	r.Handle("/api/groups", authenticated(apiCreateGroupHandler, false)).Methods("POST")
 	r.Handle("/api/groups/{id}", readOnly(apiGroupHandler, false)).Methods("GET")
+	r.Handle("/api/groups/{id}", authenticated(apiGroupUpdateHandler, false)).Methods("POST")
 	r.Handle("/api/groups/{id}", authenticated(apiGroupDeleteHandler, false)).Methods("DELETE")
 	r.Handle("/api/groups/reorder", authenticated(apiGroupReorderHandler, false)).Methods("POST")
 

notifiers/email.go

@@ -230,10 +230,12 @@ func (u *email) OnTest() error {
 	if err != nil {
 		return err
 	}
-	auth := smtp.PlainAuth("", u.Username, u.Password, host)
-	err = dial.Auth(auth)
-	if err != nil {
-		return err
+	if u.Username != "" || u.Password != "" {
+		auth := smtp.PlainAuth("", u.Username, u.Password, host)
+		err = dial.Auth(auth)
+		if err != nil {
+			return err
+		}
 	}
 	testService := &types.Service{
 		Id:             1,