summaryrefslogtreecommitdiffstats
path: root/web_src/js/index.js
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-05-21 02:15:30 +0100
committerGitHub <noreply@github.com>2020-05-20 22:15:30 -0300
commit3eb323901c6ec791294db492783e202558c2824f (patch)
tree0422f11c5089213dfb165deb24f9861353599c80 /web_src/js/index.js
parentb797b76abd13beba348415bdb81c7d3593bb01f9 (diff)
downloadgitea-3eb323901c6ec791294db492783e202558c2824f.tar.gz
gitea-3eb323901c6ec791294db492783e202558c2824f.zip
Fix repo-list private and total count bugs (#11500)
* Fix repo-list private and total count bugs Signed-off-by: Andrew Thornton <art27@cantab.net> * Ensure limited and private org public repos are displayed on "private" Signed-off-by: Andrew Thornton <art27@cantab.net> * switch from onlyPrivate to is_private Signed-off-by: Andrew Thornton <art27@cantab.net> * Generate swagger Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'web_src/js/index.js')
-rw-r--r--web_src/js/index.js54
1 files changed, 8 insertions, 46 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js
index a1b92f38a9..4042924b6f 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -2744,7 +2744,7 @@ function initVueComponents() {
}&page=${this.page}&limit=${this.searchLimit}&mode=${this.repoTypes[this.reposFilter].searchMode
}${this.reposFilter !== 'all' ? '&exclusive=1' : ''
}${this.archivedFilter === 'archived' ? '&archived=true' : ''}${this.archivedFilter === 'unarchived' ? '&archived=false' : ''
- }${this.privateFilter === 'private' ? '&onlyPrivate=true' : ''}${this.privateFilter === 'public' ? '&private=false' : ''
+ }${this.privateFilter === 'private' ? '&is_private=true' : ''}${this.privateFilter === 'public' ? '&is_private=false' : ''
}`;
},
repoTypeCount() {
@@ -2910,56 +2910,18 @@ function initVueComponents() {
this.searchRepos();
},
- showArchivedRepo(repo) {
- switch (this.archivedFilter) {
- case 'both':
- return true;
- case 'unarchived':
- return !repo.archived;
- case 'archived':
- return repo.archived;
- default:
- return !repo.archived;
- }
- },
-
- showPrivateRepo(repo) {
- switch (this.privateFilter) {
- case 'both':
- return true;
- case 'public':
- return !repo.private;
- case 'private':
- return repo.private;
- default:
- return true;
- }
- },
-
- showFilteredRepo(repo) {
- switch (this.reposFilter) {
- case 'sources':
- return repo.owner.id === this.uid && !repo.mirror && !repo.fork;
- case 'forks':
- return repo.owner.id === this.uid && !repo.mirror && repo.fork;
- case 'mirrors':
- return repo.mirror;
- case 'collaborative':
- return repo.owner.id !== this.uid && !repo.mirror;
- default:
- return true;
- }
- },
-
- showRepo(repo) {
- return this.showArchivedRepo(repo) && this.showPrivateRepo(repo) && this.showFilteredRepo(repo);
- },
-
searchRepos() {
const self = this;
this.isLoading = true;
+ if (!this.reposTotalCount) {
+ const totalCountSearchURL = `${this.suburl}/api/v1/repos/search?sort=updated&order=desc&uid=${this.uid}&q=&page=1&mode=`;
+ $.getJSON(totalCountSearchURL, (_result, _textStatus, request) => {
+ self.reposTotalCount = request.getResponseHeader('X-Total-Count');
+ });
+ }
+
const searchedMode = this.repoTypes[this.reposFilter].searchMode;
const searchedURL = this.searchURL;
const searchedQuery = this.searchQuery;