Add support for archiving lists and namespaces #152
44
pkg/migration/20200308205855.go
Normal file
44
pkg/migration/20200308205855.go
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
// Vikunja is a todo-list application to facilitate your life.
|
||||||
|
// Copyright 2018-2020 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 General Public License 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 General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package migration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"src.techknowlogick.com/xormigrate"
|
||||||
|
"xorm.io/xorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type list20200308205855 struct {
|
||||||
|
IsArchived bool `xorm:"not null default false"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s list20200308205855) TableName() string {
|
||||||
|
return "list"
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
migrations = append(migrations, &xormigrate.Migration{
|
||||||
|
ID: "20200308205855",
|
||||||
|
Description: "Add is archived flag to lists",
|
||||||
|
Migrate: func(tx *xorm.Engine) error {
|
||||||
|
return tx.Sync2(list20200308205855{})
|
||||||
|
},
|
||||||
|
Rollback: func(tx *xorm.Engine) error {
|
||||||
|
return tx.DropTables(list20200308205855{})
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
44
pkg/migration/20200308210130.go
Normal file
44
pkg/migration/20200308210130.go
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
// Vikunja is a todo-list application to facilitate your life.
|
||||||
|
// Copyright 2018-2020 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 General Public License 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 General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package migration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"src.techknowlogick.com/xormigrate"
|
||||||
|
"xorm.io/xorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type namepsace20200308210130 struct {
|
||||||
|
IsArchived bool `xorm:"not null default false"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s namepsace20200308210130) TableName() string {
|
||||||
|
return "namespaces"
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
migrations = append(migrations, &xormigrate.Migration{
|
||||||
|
ID: "20200308210130",
|
||||||
|
Description: "Add is archived flag to namepaces",
|
||||||
|
Migrate: func(tx *xorm.Engine) error {
|
||||||
|
return tx.Sync2(namepsace20200308210130{})
|
||||||
|
},
|
||||||
|
Rollback: func(tx *xorm.Engine) error {
|
||||||
|
return tx.DropTables(namepsace20200308210130{})
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
|
@ -172,6 +172,7 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
|
||||||
Where("team_members.user_id = ?", doer.ID).
|
Where("team_members.user_id = ?", doer.ID).
|
||||||
Or("namespaces.owner_id = ?", doer.ID).
|
Or("namespaces.owner_id = ?", doer.ID).
|
||||||
Or("users_namespace.user_id = ?", doer.ID).
|
Or("users_namespace.user_id = ?", doer.ID).
|
||||||
|
And("namespaces.is_archived = false").
|
||||||
GroupBy("namespaces.id").
|
GroupBy("namespaces.id").
|
||||||
Limit(getLimitFromPageIndex(page, perPage)).
|
Limit(getLimitFromPageIndex(page, perPage)).
|
||||||
Where("namespaces.name LIKE ?", "%"+search+"%").
|
Where("namespaces.name LIKE ?", "%"+search+"%").
|
||||||
|
@ -191,6 +192,7 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
|
||||||
Where("team_members.user_id = ?", doer.ID).
|
Where("team_members.user_id = ?", doer.ID).
|
||||||
Or("namespaces.owner_id = ?", doer.ID).
|
Or("namespaces.owner_id = ?", doer.ID).
|
||||||
Or("users_namespace.user_id = ?", doer.ID).
|
Or("users_namespace.user_id = ?", doer.ID).
|
||||||
|
And("namespaces.is_archived = false").
|
||||||
GroupBy("users.id").
|
GroupBy("users.id").
|
||||||
Find(&users)
|
Find(&users)
|
||||||
|
|
||||||
|
@ -223,6 +225,7 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
|
||||||
Join("LEFT", []string{"users_list", "ul"}, "ul.list_id = l.id").
|
Join("LEFT", []string{"users_list", "ul"}, "ul.list_id = l.id").
|
||||||
Where("tm.user_id = ?", doer.ID).
|
Where("tm.user_id = ?", doer.ID).
|
||||||
Or("ul.user_id = ?", doer.ID).
|
Or("ul.user_id = ?", doer.ID).
|
||||||
|
And("l.is_archived = false").
|
||||||
GroupBy("l.id").
|
GroupBy("l.id").
|
||||||
Find(&individualLists)
|
Find(&individualLists)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -275,6 +278,7 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r
|
||||||
Where("team_members.user_id = ?", doer.ID).
|
Where("team_members.user_id = ?", doer.ID).
|
||||||
Or("namespaces.owner_id = ?", doer.ID).
|
Or("namespaces.owner_id = ?", doer.ID).
|
||||||
Or("users_namespace.user_id = ?", doer.ID).
|
Or("users_namespace.user_id = ?", doer.ID).
|
||||||
|
And("namespaces.is_archived = false").
|
||||||
GroupBy("namespaces.id").
|
GroupBy("namespaces.id").
|
||||||
Where("namespaces.name LIKE ?", "%"+search+"%").
|
Where("namespaces.name LIKE ?", "%"+search+"%").
|
||||||
Count(&NamespaceWithLists{})
|
Count(&NamespaceWithLists{})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user