diff --git a/services/web/app/views/project/list/side-bar.pug b/services/web/app/views/project/list/side-bar.pug index 1fb0e2bda9..1c946a5664 100644 --- a/services/web/app/views/project/list/side-bar.pug +++ b/services/web/app/views/project/list/side-bar.pug @@ -79,6 +79,11 @@ li a(href, ng-click="deleteTag(tag)", stop-propagation="click") | #{translate("delete")} + li.tag( + ng-if="tags.length", + ng-cloak, + ng-click="selectUntagged()" + ) uncategorized li(ng-cloak) a.tag(href, ng-click="openNewTagModal()") i.fa.fa-fw.fa-plus diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index fc9c3ea800..a46345b167 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/services/web/public/coffee/main/project-list/project-list.coffee @@ -113,6 +113,10 @@ define [ if $scope.filter == "tag" and selectedTag? and project.id not in selectedTag.project_ids visible = false + # Hide tagged projects if we only want to see the uncategorized ones + if $scope.filter == "untagged" and project.tags? + visible = false + # Hide projects we own if we only want to see shared projects if $scope.filter == "shared" and project.accessLevel == "owner" visible = false diff --git a/services/web/public/coffee/main/project-list/tag-controllers.coffee b/services/web/public/coffee/main/project-list/tag-controllers.coffee index cc3415e32e..6a75e7491b 100644 --- a/services/web/public/coffee/main/project-list/tag-controllers.coffee +++ b/services/web/public/coffee/main/project-list/tag-controllers.coffee @@ -15,7 +15,11 @@ define [ $scope._clearTags() tag.selected = true $scope.setFilter("tag") - + + $scope.selectUntagged = () -> + $scope._clearTags() + $scope.setFilter("untagged") + $scope.deleteTag = (tag) -> modalInstance = $modal.open( templateUrl: "deleteTagModalTemplate"