ami/tl-vikunja
1
0
Fork 0
Code

fix(filters): allow managing views for saved filters

Browse Source
This commit is contained in:
kolaente 2024-07-02 12:36:08 +02:00
parent 10bad95440
commit e6ce1251f7
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/project/ProjectSettingsDropdown.vue
View File

@ -24,9 +24,16 @@
> >
{{ $t('menu.edit') }} {{ $t('menu.edit') }}
</DropdownItem> </DropdownItem>
<DropdownItem
:to="{ name: 'project.settings.views', params: { projectId: project.id } }"
icon="eye"
>
{{ $t('menu.views') }}
</DropdownItem>
<DropdownItem <DropdownItem
:to="{ name: 'filter.settings.delete', params: { projectId: project.id } }" :to="{ name: 'filter.settings.delete', params: { projectId: project.id } }"
icon="trash-alt" icon="trash-alt"
class="has-text-danger"
> >
{{ $t('misc.delete') }} {{ $t('misc.delete') }}
</DropdownItem> </DropdownItem>

24
pkg/models/project_view_rights.go
View File

@ -22,21 +22,45 @@ import (
) )
func (p *ProjectView) CanRead(s *xorm.Session, a web.Auth) (bool, int, error) { func (p *ProjectView) CanRead(s *xorm.Session, a web.Auth) (bool, int, error) {
filterID := getSavedFilterIDFromProjectID(p.ProjectID)
if filterID > 0 {
sf := &SavedFilter{ID: filterID}
return sf.CanRead(s, a)
}
pp := p.getProject() pp := p.getProject()
return pp.CanRead(s, a) return pp.CanRead(s, a)
} }
func (p *ProjectView) CanDelete(s *xorm.Session, a web.Auth) (bool, error) { func (p *ProjectView) CanDelete(s *xorm.Session, a web.Auth) (bool, error) {
filterID := getSavedFilterIDFromProjectID(p.ProjectID)
if filterID > 0 {
sf := &SavedFilter{ID: filterID}
return sf.CanDelete(s, a)
}
pp := p.getProject() pp := p.getProject()
return pp.IsAdmin(s, a) return pp.IsAdmin(s, a)
} }
func (p *ProjectView) CanUpdate(s *xorm.Session, a web.Auth) (bool, error) { func (p *ProjectView) CanUpdate(s *xorm.Session, a web.Auth) (bool, error) {
filterID := getSavedFilterIDFromProjectID(p.ProjectID)
if filterID > 0 {
sf := &SavedFilter{ID: filterID}
return sf.CanUpdate(s, a)
}
pp := p.getProject() pp := p.getProject()
return pp.IsAdmin(s, a) return pp.IsAdmin(s, a)
} }
func (p *ProjectView) CanCreate(s *xorm.Session, a web.Auth) (bool, error) { func (p *ProjectView) CanCreate(s *xorm.Session, a web.Auth) (bool, error) {
filterID := getSavedFilterIDFromProjectID(p.ProjectID)
if filterID > 0 {
sf := &SavedFilter{ID: filterID}
return sf.CanUpdate(s, a)
}
pp := p.getProject() pp := p.getProject()
return pp.IsAdmin(s, a) return pp.IsAdmin(s, a)
} }