thor/zeit
1
0
Fork 0
mirror of https://github.com/Threnklyn/zeit.git synced 2026-06-07 14:13:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

GetProjectIdFromName -> GetIdFromName

Browse Source
This commit is contained in:
マリウス
2020-10-17 13:14:58 +01:00
parent 798af1a486
commit ee1ab3204b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
z/calendar.go
+1 -1
View File
@@ -44,7 +44,7 @@ func NewCalendar(entries []Entry) (Calendar, error) {
sameDayHours := decimal.NewFromInt(0) sameDayHours := decimal.NewFromInt(0)
nextDayHours := decimal.NewFromInt(0) nextDayHours := decimal.NewFromInt(0)
projectId := GetProjectIdFromName(entry.Project) projectId := GetIdFromName(entry.Project)
if projects[projectId].Name == "" { if projects[projectId].Name == "" {
project, err := database.GetProject(entry.User, entry.Project) project, err := database.GetProject(entry.User, entry.Project)
z/database.go
+2 -2
View File
@@ -229,7 +229,7 @@ func (database *Database) UpdateProject(user string, projectName string, project
return jsonerr return jsonerr
} }
projectId := GetProjectIdFromName(projectName) projectId := GetIdFromName(projectName)
dberr := database.DB.Update(func(tx *buntdb.Tx) error { dberr := database.DB.Update(func(tx *buntdb.Tx) error {
_, _, sperr := tx.Set(user + ":project:" + projectId, string(projectJson), nil) _, _, sperr := tx.Set(user + ":project:" + projectId, string(projectJson), nil)
@@ -245,7 +245,7 @@ func (database *Database) UpdateProject(user string, projectName string, project
func (database *Database) GetProject(user string, projectName string) (Project, error) { func (database *Database) GetProject(user string, projectName string) (Project, error) {
var project Project var project Project
projectId := GetProjectIdFromName(projectName) projectId := GetIdFromName(projectName)
dberr := database.DB.View(func(tx *buntdb.Tx) error { dberr := database.DB.View(func(tx *buntdb.Tx) error {
value, err := tx.Get(user + ":project:" + projectId, false) value, err := tx.Get(user + ":project:" + projectId, false)
z/helpers.go
+1 -1
View File
@@ -102,7 +102,7 @@ func ParseTime(timeStr string) (time.Time, error) {
} }
} }
func GetProjectIdFromName(projectName string) string { func GetIdFromName(projectName string) string {
reg, regerr := regexp.Compile("[^a-zA-Z0-9]+") reg, regerr := regexp.Compile("[^a-zA-Z0-9]+")
if regerr != nil { if regerr != nil {
return "" return ""