From 7c2b1ffadabca126e6fdc2b211801109b8b93d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Kurowski?= <crackcomm@gmail.com>
Date: Fri, 20 Jan 2017 08:23:54 +0100
Subject: cleaner code

---
 system/admin/admin.go | 68 ++++++++++++++-------------------------------------
 1 file changed, 18 insertions(+), 50 deletions(-)

(limited to 'system')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 9c4cfdd..97462ff 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -93,10 +93,10 @@ type admin struct {
 }
 
 // Admin ...
-func Admin(view []byte) ([]byte, error) {
+func Admin(view []byte) (_ []byte, err error) {
 	cfg, err := db.Config("name")
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	if cfg == nil {
@@ -114,7 +114,7 @@ func Admin(view []byte) ([]byte, error) {
 	tmpl := template.Must(template.New("admin").Parse(html))
 	err = tmpl.Execute(buf, a)
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	return buf.Bytes(), nil
@@ -476,12 +476,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
-	view, err := Admin(buf.Bytes())
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(buf.Bytes())
 }
 
 var analyticsHTML = `
@@ -535,8 +530,7 @@ var analyticsHTML = `
 
 // Dashboard returns the admin view with analytics dashboard
 func Dashboard() ([]byte, error) {
-	buf := &bytes.Buffer{}
-
+	buf := new(bytes.Buffer)
 	data, err := analytics.ChartData()
 	if err != nil {
 		return nil, err
@@ -547,16 +541,10 @@ func Dashboard() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	view, err := Admin(buf.Bytes())
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(buf.Bytes())
 }
 
-var err400HTML = `
+var err400HTML = []byte(`
 <div class="error-page e400 col s6">
 <div class="card">
 <div class="card-content">
@@ -565,19 +553,14 @@ var err400HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error400 creates a subview for a 400 error page
 func Error400() ([]byte, error) {
-	view, err := Admin([]byte(err400HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err400HTML)
 }
 
-var err404HTML = `
+var err404HTML = []byte(`
 <div class="error-page e404 col s6">
 <div class="card">
 <div class="card-content">
@@ -586,19 +569,14 @@ var err404HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error404 creates a subview for a 404 error page
 func Error404() ([]byte, error) {
-	view, err := Admin([]byte(err404HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err404HTML)
 }
 
-var err405HTML = `
+var err405HTML = []byte(`
 <div class="error-page e405 col s6">
 <div class="card">
 <div class="card-content">
@@ -607,19 +585,14 @@ var err405HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error405 creates a subview for a 405 error page
 func Error405() ([]byte, error) {
-	view, err := Admin([]byte(err405HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err405HTML)
 }
 
-var err500HTML = `
+var err500HTML = []byte(`
 <div class="error-page e500 col s6">
 <div class="card">
 <div class="card-content">
@@ -628,14 +601,9 @@ var err500HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error500 creates a subview for a 500 error page
 func Error500() ([]byte, error) {
-	view, err := Admin([]byte(err500HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err500HTML)
 }
-- 
cgit v1.2.3


From 13e3226f8095d27c4d70756560a7575837d80495 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Fri, 20 Jan 2017 00:29:16 -0800
Subject: switching new -> & for consistency w/ codebase

---
 system/admin/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 97462ff..3df6805 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -530,7 +530,7 @@ var analyticsHTML = `
 
 // Dashboard returns the admin view with analytics dashboard
 func Dashboard() ([]byte, error) {
-	buf := new(bytes.Buffer)
+	buf := &bytes.Buffer{}
 	data, err := analytics.ChartData()
 	if err != nil {
 		return nil, err
-- 
cgit v1.2.3