Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add setting to set default and global disabled repository units. #8788

Merged
merged 16 commits into from
Jan 17, 2020
Merged

Add setting to set default and global disabled repository units. #8788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
660310c
Add possibility to global disable repo units.
davidsvantesson Nov 1, 2019
9c77ff4
Merge branch 'master' into global-disable-units
davidsvantesson Nov 2, 2019
d3f4f3f
Merge branch 'master' into global-disable-units
davidsvantesson Jan 2, 2020
3c0f893
Add Default Repo Unit app.ini setting.
davidsvantesson Jan 4, 2020
70b39b9
Hide units
davidsvantesson Jan 9, 2020
ddd01f6
Hide disabled repo units
davidsvantesson Jan 12, 2020
157393c
Minor fixes
davidsvantesson Jan 12, 2020
a0fe2ab
Merge branch 'master' into global-disable-units
davidsvantesson Jan 12, 2020
dbb4cee
Merge branch 'master' into global-disable-units
davidsvantesson Jan 13, 2020
9fdd587
Indicate disabled units in team settings.
davidsvantesson Jan 13, 2020
95deb3e
Merge branch 'master' into global-disable-units
davidsvantesson Jan 13, 2020
f31e75b
Merge branch 'master' into global-disable-units
lafriks Jan 15, 2020
50ba887
Merge branch 'master' into global-disable-units
lunny Jan 15, 2020
c6948f4
Merge branch 'master' into global-disable-units
zeripath Jan 15, 2020
6b2e4eb
Merge branch 'master' into global-disable-units
davidsvantesson Jan 15, 2020
9f07275
Merge branch 'master' into global-disable-units
lafriks Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Indicate disabled units in team settings.
  • Loading branch information
@davidsvantesson
davidsvantesson committed Jan 13, 2020
commit 9fdd5871599fa2dca1befdc937cab9f87051532c
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,7 @@ team_desc_helper = Describe the purpose or role of the team.
team_access_desc = Repository access
team_permission_desc = Permission
team_unit_desc = Allow Access to Repository Sections
team_unit_disabled = (Disabled)

form.name_reserved = The organization name '%s' is reserved.
form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name.
Expand Down
6 changes: 5 additions & 1 deletion templates/org/team/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,14 @@
<label>{{.i18n.Tr "org.team_unit_desc"}}</label>
<br>
{{range $t, $unit := $.Units}}
{{if $unit.Type.UnitGlobalDisabled}}
<div class="field poping up" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
{{else}}
<div class="field">
{{end}}
<div class="ui toggle checkbox">
<input type="checkbox" class="hidden" name="units" value="{{$unit.Type.Value}}"{{if or (eq $.Team.ID 0) ($.Team.UnitEnabled $unit.Type)}} checked{{end}}>
<label>{{$.i18n.Tr $unit.NameKey}}</label>
<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
</div>
</div>
Expand Down