DodoApp: Clean up commits on branch/app delete
Fix redirect URL after app deletion.
Change-Id: Id26b114d9dc47a8de547368e55531816d21dd26c
diff --git a/core/installer/welcome/dodo_app.go b/core/installer/welcome/dodo_app.go
index 57de50e..00cf794 100644
--- a/core/installer/welcome/dodo_app.go
+++ b/core/installer/welcome/dodo_app.go
@@ -957,7 +957,7 @@
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- http.Redirect(w, r, fmt.Sprintf("/%s", appName), http.StatusSeeOther)
+ http.Redirect(w, r, "/", http.StatusSeeOther)
}
type apiCreateAppReq struct {
@@ -1125,9 +1125,11 @@
return err
}
if branch != "master" {
- return s.client.DeleteRepoBranch(appName, branch)
+ if err := s.client.DeleteRepoBranch(appName, branch); err != nil {
+ return err
+ }
}
- return nil
+ return s.st.DeleteBranch(appName, branch)
}
func (s *DodoAppServer) deleteApp(appName string) error {
@@ -1147,7 +1149,10 @@
return err
}
}
- return s.client.DeleteRepo(appName)
+ if err := s.client.DeleteRepo(appName); err != nil {
+ return err
+ }
+ return s.st.DeleteApp(appName)
}
func (s *DodoAppServer) createAppForBranch(