ami/tl-vikunja
1
0
Fork 0
Code

feat(views): use project id when fetching views

Browse Source
This commit is contained in:
kolaente 2024-03-14 15:45:50 +01:00
parent 98b7cc9254
commit 38457aaca5
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models/project_view.go
View File

@ -113,7 +113,7 @@ func (p *ProjectView) ReadAll(s *xorm.Session, a web.Auth, _ string, _ int, _ in
// @Failure 500 {object} models.Message "Internal error" // @Failure 500 {object} models.Message "Internal error"
// @Router /projects/{project}/views/{id} [get] // @Router /projects/{project}/views/{id} [get]
func (p *ProjectView) ReadOne(s *xorm.Session, _ web.Auth) (err error) { func (p *ProjectView) ReadOne(s *xorm.Session, _ web.Auth) (err error) {
view, err := GetProjectViewByID(s, p.ID) view, err := GetProjectViewByID(s, p.ID, p.ProjectID)
if err != nil { if err != nil {
return err return err
} }
@ -176,7 +176,7 @@ func (p *ProjectView) Create(s *xorm.Session, a web.Auth) (err error) {
// @Router /projects/{project}/views/{id} [post] // @Router /projects/{project}/views/{id} [post]
func (p *ProjectView) Update(s *xorm.Session, _ web.Auth) (err error) { func (p *ProjectView) Update(s *xorm.Session, _ web.Auth) (err error) {
// Check if the project view exists // Check if the project view exists
_, err = GetProjectViewByID(s, p.ID) _, err = GetProjectViewByID(s, p.ID, p.ProjectID)
if err != nil { if err != nil {
return return
} }
@ -189,9 +189,9 @@ func (p *ProjectView) Update(s *xorm.Session, _ web.Auth) (err error) {
return return
} }
func GetProjectViewByID(s *xorm.Session, id int64) (view *ProjectView, err error) { func GetProjectViewByID(s *xorm.Session, id, projectID int64) (view *ProjectView, err error) {
exists, err := s. exists, err := s.
Where("id = ?", id). Where("id = ? AND project_id = ?", id, projectID).
NoAutoCondition(). NoAutoCondition().
Get(view) Get(view)
if err != nil { if err != nil {

2
pkg/models/task_collection.go
View File

@ -172,7 +172,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
} }
if tf.ProjectViewID != 0 { if tf.ProjectViewID != 0 {
view, err := GetProjectViewByID(s, tf.ProjectViewID) view, err := GetProjectViewByID(s, tf.ProjectViewID, tf.ProjectID)
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }