bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

Add warning message and help icon (#652)

Browse Source
This commit is contained in:
Brandon Treston
2024-10-18 09:34:06 -04:00
committed by GitHub
parent 3c5bafe39f
commit e3fbc4e731
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/tabs/settings.component.html
View File

@@ -487,20 +487,6 @@
}}</label> }}</label>
</div> </div>
</div> </div>
<div class="mb-3">
<div class="form-check">
<input
class="form-check-input"
type="checkbox"
id="overwriteExisting"
[(ngModel)]="sync.overwriteExisting"
name="OverwriteExisting"
/>
<label class="form-check-label" for="overwriteExisting">{{
"overwriteExisting" | i18n
}}</label>
</div>
</div>
<div class="mb-3"> <div class="mb-3">
<div class="form-check"> <div class="form-check">
<input <input
@@ -749,6 +735,31 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tw-mb-3">
<div class="form-check">
<input
class="form-check-input"
type="checkbox"
id="overwriteExisting"
[(ngModel)]="sync.overwriteExisting"
name="OverwriteExisting"
/>
<label class="form-check-label" for="overwriteExisting"
>{{ "overwriteExisting" | i18n }}
<a
bitLink
class="tw-ml-auto"
href="https://bitwarden.com/help/user-group-filters/#overwriting-syncs"
target="_blank"
rel="noreferrer"
appA11yTitle="{{ 'overwriteExistingTooltip' | i18n }}"
slot="end"
>
<i class="bwi bwi-question-circle"></i>
</a>
</label>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

5
src/locales/en/messages.json
View File

@@ -647,7 +647,10 @@
"message": "More than 2000 users or groups are expected to sync." "message": "More than 2000 users or groups are expected to sync."
}, },
"overwriteExisting": { "overwriteExisting": {
"message": "Overwrite existing organization users based on current sync settings." "message": "Remove and re-add organization users during the next sync (For debugging purposes)"
},
"overwriteExistingTooltip":{
"message": "Learn more about Sync options"
}, },
"clientId": { "clientId": {
"message": "Client ID" "message": "Client ID"