Browse Source

User model fixed and flags logic now working

Blallo 5 năm trước cách đây
mục cha
commit
504363799e
2 tập tin đã thay đổi với 9 bổ sung9 xóa
  1. 4 4
      cmd/panelcli/cli.go
  2. 5 5
      db/db.go

+ 4 - 4
cmd/panelcli/cli.go

@@ -101,17 +101,17 @@ func composeListUserOutput(user paneldb.User, usernameFlag, emailFlag, dateCreat
 	var row string
 	if usernameFlag {
 		row += user.UserName
-		if emailFlag || !dateCreatedFlag {
+		if emailFlag || dateCreatedFlag {
 			row += "\t"
 		}
 	}
 	if emailFlag {
 		row += user.Email
-		if !dateCreatedFlag {
+		if dateCreatedFlag {
 			row += "\t"
 		}
 	}
-	if !dateCreatedFlag {
+	if dateCreatedFlag {
 		row += user.DateCreated
 	}
 	fmt.Fprintln(os.Stdout, row)
@@ -131,7 +131,7 @@ func cmdListUsers(args []string) error {
 		os.Exit(1)
 	}
 	// Printing the header
-	if *headerFlag {
+	if !*headerFlag {
 		header := paneldb.User{
 			UserName:    "username",
 			Email:       "email",

+ 5 - 5
db/db.go

@@ -9,11 +9,11 @@ import (
 )
 
 type User struct {
-	Id           string
-	UserName     string
-	Email        string
-	DateCreated  string
-	PasswordHash string
+	ID           string `sql:"uid"`
+	UserName     string `sql:"username"`
+	Email        string `sql:"email"`
+	DateCreated  string `sql:"date_created"`
+	PasswordHash string `sql:"password"`
 }
 
 type DB struct {