forked from vikunja/vikunja
Merge branch 'main' of ssh://kolaente.dev:9022/vikunja/api into main
This commit is contained in:
commit
ae90aa80aa
2
go.mod
2
go.mod
|
@ -70,7 +70,7 @@ require (
|
||||||
github.com/ulule/limiter/v3 v3.8.0
|
github.com/ulule/limiter/v3 v3.8.0
|
||||||
github.com/yuin/goldmark v1.3.7
|
github.com/yuin/goldmark v1.3.7
|
||||||
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
|
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
|
||||||
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e
|
golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9
|
||||||
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
|
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
|
||||||
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
|
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
|
||||||
|
|
2
go.sum
2
go.sum
|
@ -825,6 +825,8 @@ golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+o
|
||||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e h1:PzJMNfFQx+QO9hrC1GwZ4BoPGeNGhfeQEgcQFArEjPk=
|
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e h1:PzJMNfFQx+QO9hrC1GwZ4BoPGeNGhfeQEgcQFArEjPk=
|
||||||
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
|
golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9 h1:D0iM1dTCbD5Dg1CbuvLC/v/agLc79efSj/L35Q3Vqhs=
|
||||||
|
golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
|
||||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||||
|
|
|
@ -47,6 +47,9 @@ func Dump() (data map[string][]byte, err error) {
|
||||||
|
|
||||||
// Restore restores a table with all its entries
|
// Restore restores a table with all its entries
|
||||||
func Restore(table string, contents []map[string]interface{}) (err error) {
|
func Restore(table string, contents []map[string]interface{}) (err error) {
|
||||||
|
if _, err := x.IsTableExist(table); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
for _, content := range contents {
|
for _, content := range contents {
|
||||||
if _, err := x.Table(table).Insert(content); err != nil {
|
if _, err := x.Table(table).Insert(content); err != nil {
|
||||||
|
|
43
pkg/migration/20210603174608.go
Normal file
43
pkg/migration/20210603174608.go
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
// Vikunja is a to-do list application to facilitate your life.
|
||||||
|
// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public Licensee as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public Licensee for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public Licensee
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package migration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"src.techknowlogick.com/xormigrate"
|
||||||
|
"xorm.io/xorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type users20210603174608 struct {
|
||||||
|
WeekStart int `xorm:"null" json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (users20210603174608) TableName() string {
|
||||||
|
return "users"
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
migrations = append(migrations, &xormigrate.Migration{
|
||||||
|
ID: "20210603174608",
|
||||||
|
Description: "Add week start user setting",
|
||||||
|
Migrate: func(tx *xorm.Engine) error {
|
||||||
|
return tx.Sync2(users20210603174608{})
|
||||||
|
},
|
||||||
|
Rollback: func(tx *xorm.Engine) error {
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
|
@ -58,7 +58,13 @@ func HandleTesting(c echo.Context) error {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.RestoreAndTruncate(table, content)
|
truncate := c.QueryParam("truncate")
|
||||||
|
if truncate == "true" || truncate == "" {
|
||||||
|
err = db.RestoreAndTruncate(table, content)
|
||||||
|
} else {
|
||||||
|
err = db.Restore(table, content)
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return c.JSON(http.StatusInternalServerError, map[string]interface{}{
|
return c.JSON(http.StatusInternalServerError, map[string]interface{}{
|
||||||
"error": true,
|
"error": true,
|
||||||
|
|
|
@ -48,6 +48,8 @@ type UserSettings struct {
|
||||||
// If a task is created without a specified list this value should be used. Applies
|
// If a task is created without a specified list this value should be used. Applies
|
||||||
// to tasks made directly in API and from clients.
|
// to tasks made directly in API and from clients.
|
||||||
DefaultListID int64 `json:"default_list_id"`
|
DefaultListID int64 `json:"default_list_id"`
|
||||||
|
// The day when the week starts for this user. 0 = sunday, 1 = monday, etc.
|
||||||
|
WeekStart int `json:"week_start"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUserAvatarProvider returns the currently set user avatar
|
// GetUserAvatarProvider returns the currently set user avatar
|
||||||
|
@ -174,6 +176,7 @@ func UpdateGeneralUserSettings(c echo.Context) error {
|
||||||
user.DiscoverableByName = us.DiscoverableByName
|
user.DiscoverableByName = us.DiscoverableByName
|
||||||
user.OverdueTasksRemindersEnabled = us.OverdueTasksRemindersEnabled
|
user.OverdueTasksRemindersEnabled = us.OverdueTasksRemindersEnabled
|
||||||
user.DefaultListID = us.DefaultListID
|
user.DefaultListID = us.DefaultListID
|
||||||
|
user.WeekStart = us.WeekStart
|
||||||
|
|
||||||
_, err = user2.UpdateUser(s, user)
|
_, err = user2.UpdateUser(s, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -69,6 +69,7 @@ func UserShow(c echo.Context) error {
|
||||||
DiscoverableByEmail: u.DiscoverableByEmail,
|
DiscoverableByEmail: u.DiscoverableByEmail,
|
||||||
OverdueTasksRemindersEnabled: u.OverdueTasksRemindersEnabled,
|
OverdueTasksRemindersEnabled: u.OverdueTasksRemindersEnabled,
|
||||||
DefaultListID: u.DefaultListID,
|
DefaultListID: u.DefaultListID,
|
||||||
|
WeekStart: u.WeekStart,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8579,6 +8579,10 @@ var doc = `{
|
||||||
"overdue_tasks_reminders_enabled": {
|
"overdue_tasks_reminders_enabled": {
|
||||||
"description": "If enabled, the user will get an email for their overdue tasks each morning.",
|
"description": "If enabled, the user will get an email for their overdue tasks each morning.",
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"week_start": {
|
||||||
|
"description": "The day when the week starts for this user. 0 = sunday, 1 = monday, etc.",
|
||||||
|
"type": "integer"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -8562,6 +8562,10 @@
|
||||||
"overdue_tasks_reminders_enabled": {
|
"overdue_tasks_reminders_enabled": {
|
||||||
"description": "If enabled, the user will get an email for their overdue tasks each morning.",
|
"description": "If enabled, the user will get an email for their overdue tasks each morning.",
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"week_start": {
|
||||||
|
"description": "The day when the week starts for this user. 0 = sunday, 1 = monday, etc.",
|
||||||
|
"type": "integer"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -1201,6 +1201,10 @@ definitions:
|
||||||
description: If enabled, the user will get an email for their overdue tasks
|
description: If enabled, the user will get an email for their overdue tasks
|
||||||
each morning.
|
each morning.
|
||||||
type: boolean
|
type: boolean
|
||||||
|
week_start:
|
||||||
|
description: The day when the week starts for this user. 0 = sunday, 1 = monday,
|
||||||
|
etc.
|
||||||
|
type: integer
|
||||||
type: object
|
type: object
|
||||||
v1.authInfo:
|
v1.authInfo:
|
||||||
properties:
|
properties:
|
||||||
|
|
|
@ -72,6 +72,7 @@ type User struct {
|
||||||
DiscoverableByEmail bool `xorm:"bool default false index" json:"-"`
|
DiscoverableByEmail bool `xorm:"bool default false index" json:"-"`
|
||||||
OverdueTasksRemindersEnabled bool `xorm:"bool default true index" json:"-"`
|
OverdueTasksRemindersEnabled bool `xorm:"bool default true index" json:"-"`
|
||||||
DefaultListID int64 `xorm:"bigint null index" json:"-"`
|
DefaultListID int64 `xorm:"bigint null index" json:"-"`
|
||||||
|
WeekStart int `xorm:"null" json:"-"`
|
||||||
|
|
||||||
// A timestamp when this task was created. You cannot change this value.
|
// A timestamp when this task was created. You cannot change this value.
|
||||||
Created time.Time `xorm:"created not null" json:"created"`
|
Created time.Time `xorm:"created not null" json:"created"`
|
||||||
|
@ -373,6 +374,7 @@ func UpdateUser(s *xorm.Session, user *User) (updatedUser *User, err error) {
|
||||||
"discoverable_by_email",
|
"discoverable_by_email",
|
||||||
"overdue_tasks_reminders_enabled",
|
"overdue_tasks_reminders_enabled",
|
||||||
"default_list_id",
|
"default_list_id",
|
||||||
|
"week_start",
|
||||||
).
|
).
|
||||||
Update(user)
|
Update(user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user