diff options
author | David Svantesson <davidsvantesson@gmail.com> | 2019-09-23 22:08:03 +0200 |
---|---|---|
committer | Lauris BH <lauris@nix.lv> | 2019-09-23 23:08:03 +0300 |
commit | a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1 (patch) | |
tree | a40e42bb05f62acaf64e0af5b49142985387ab42 /public | |
parent | 63ff61615ec6aaa25887f8ce605c9082c106a34b (diff) | |
download | gitea-a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1.tar.gz gitea-a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1.zip |
Add teams to repo on collaboration page. (#8045)
* Add teams to repo on collaboration page.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add option for repository admins to change teams access to repo.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add comment for functions
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Make RepoAdminChangeTeamAccess default false in xorm and make it default checked in template instead.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Make proper language strings and fix error redirection.
* Add unit tests for adding and deleting team from repository.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add database migration
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Fix redirect
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Fix locale string mismatch.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Move team access mode text logic to template.
* Move collaborator access mode text logic to template.
Diffstat (limited to 'public')
-rw-r--r-- | public/css/index.css | 3 | ||||
-rw-r--r-- | public/js/index.js | 25 | ||||
-rw-r--r-- | public/less/_repository.less | 23 |
3 files changed, 51 insertions, 0 deletions
diff --git a/public/css/index.css b/public/css/index.css index 8f24e7b3e4..1da2399c46 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -747,6 +747,8 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository.settings.collaboration .collaborator.list>.item:not(:last-child){border-bottom:1px solid #ddd} .repository.settings.collaboration #repo-collab-form #search-user-box .results{left:7px} .repository.settings.collaboration #repo-collab-form .ui.button{margin-left:5px;margin-top:-3px} +.repository.settings.collaboration #repo-collab-team-form #search-team-box .results{left:7px} +.repository.settings.collaboration #repo-collab-team-form .ui.button{margin-left:5px;margin-top:-3px} .repository.settings.branches .protected-branches .selection.dropdown{width:300px} .repository.settings.branches .protected-branches .item{border:1px solid #eaeaea;padding:10px 15px} .repository.settings.branches .protected-branches .item:not(:last-child){border-bottom:0} @@ -783,6 +785,7 @@ footer .ui.left,footer .ui.right{line-height:40px} .user-cards .list .item .meta{margin-top:5px} #search-repo-box .results .result .image,#search-user-box .results .result .image{float:left;margin-right:8px;width:2em;height:2em} #search-repo-box .results .result .content,#search-user-box .results .result .content{margin:6px 0} +#search-team-box .results .result .content{margin:6px 0} #issue-filters.hide{display:none} #issue-actions{margin-top:-1rem!important} #issue-actions.hide{display:none} diff --git a/public/js/index.js b/public/js/index.js index d99457514b..ad5e3912de 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1761,6 +1761,30 @@ function searchUsers() { }); } +function searchTeams() { + const $searchTeamBox = $('#search-team-box'); + $searchTeamBox.search({ + minCharacters: 2, + apiSettings: { + url: suburl + '/api/v1/orgs/' + $searchTeamBox.data('org') + '/teams', + headers: {"X-Csrf-Token": csrf}, + onResponse: function(response) { + const items = []; + $.each(response, function (_i, item) { + const title = item.name + ' (' + item.permission + ' access)'; + items.push({ + title: title, + }) + }); + + return { results: items } + } + }, + searchFields: ['name', 'description'], + showNoResults: false + }); +} + function searchRepositories() { const $searchRepoBox = $('#search-repo-box'); $searchRepoBox.search({ @@ -2171,6 +2195,7 @@ $(document).ready(function () { buttonsClickOnEnter(); searchUsers(); + searchTeams(); searchRepositories(); initCommentForm(); diff --git a/public/less/_repository.less b/public/less/_repository.less index 4823d1000a..fde11f7a4d 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -1736,6 +1736,19 @@ margin-top: -3px; } } + + #repo-collab-team-form { + #search-team-box { + .results { + left: 7px; + } + } + + .ui.button { + margin-left: 5px; + margin-top: -3px; + } + } } &.branches { @@ -1936,6 +1949,16 @@ } } +#search-team-box { + .results { + .result { + .content { + margin: 6px 0; + } + } + } +} + #issue-filters.hide { display: none; } |