Skip to content
Snippets Groups Projects
Commit 81b5a7b6 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Renamed 'is leaf' in 'allow child groups' and applied inverse logic

parent ed3816fa
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="col-md-4"> <div class="col-md-4">
<b-row> <b-row>
<b-col sm="5"> <b-col sm="5">
<label for="page-size">Page size:</label> <label for="page-size" class="mt-2">Page size:</label>
</b-col> </b-col>
<b-col sm="6"> <b-col sm="6">
<b-form-select id="page-size" v-model="paginatorInput.paginatorPageSize" :options="pageSizeOptions" v-on:change="changePageSize"></b-form-select> <b-form-select id="page-size" v-model="paginatorInput.paginatorPageSize" :options="pageSizeOptions" v-on:change="changePageSize"></b-form-select>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<b-navbar-nav class="ml-auto"> <b-navbar-nav class="ml-auto">
<b-nav-item href="help/index.html" target="blank_" class="mr-4">Help</b-nav-item> <b-nav-item href="help/index.html" target="blank_" class="mr-4">Help</b-nav-item>
<b-nav-form> <b-nav-form>
<b-form-input size="sm" class="mr-sm-2" placeholder="Search" v-model="input.genericSearch.filter" @keydown.native.enter.prevent="genericSearch"></b-form-input> <b-form-input size="sm" class="mr-sm-2" placeholder="Search" v-model.trim="input.genericSearch.filter" @keydown.native.enter.prevent="genericSearch"></b-form-input>
<b-button size="sm" class="my-2 my-sm-0" type="button" v-on:click="genericSearch()">Search</b-button> <b-button size="sm" class="my-2 my-sm-0" type="button" v-on:click="genericSearch()">Search</b-button>
</b-nav-form> </b-nav-form>
<b-nav-item-dropdown :text="user" right v-if="user"> <b-nav-item-dropdown :text="user" right v-if="user">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<b-form-input v-model="newGroupName" id="new-group-name-input" ref="newGroupNameInput" class="w-75" aria-describedby="new-group-name-input-feedback" :state="newGroupNameState" v-on:input="resetError" @keydown.native.enter="addGroup"> <b-form-input v-model="newGroupName" id="new-group-name-input" ref="newGroupNameInput" class="w-75" aria-describedby="new-group-name-input-feedback" :state="newGroupNameState" v-on:input="resetError" @keydown.native.enter="addGroup">
</b-form-input> </b-form-input>
<b-form-invalid-feedback id="new-group-name-input-feedback" class="text-right">{{newGroupNameError}}</b-form-invalid-feedback> <b-form-invalid-feedback id="new-group-name-input-feedback" class="text-right">{{newGroupNameError}}</b-form-invalid-feedback>
<b-form-checkbox class="mt-3 ml-3" v-model="leaf">is leaf</b-form-checkbox> <b-form-checkbox class="mt-3 ml-3" v-model="allowChildGroups">allow child groups</b-form-checkbox>
</b-form> </b-form>
</b-modal> </b-modal>
</template> </template>
...@@ -27,13 +27,13 @@ export default { ...@@ -27,13 +27,13 @@ export default {
return { return {
newGroupName: '', newGroupName: '',
newGroupNameError: '', newGroupNameError: '',
leaf: true allowChildGroups: false
}; };
}, },
methods: { methods: {
resetModal: function() { resetModal: function() {
this.newGroupName = null; this.newGroupName = null;
this.leaf = true; this.allowChildGroups = false;
this.resetError(); this.resetError();
}, },
afterShow: function() { afterShow: function() {
...@@ -49,7 +49,7 @@ export default { ...@@ -49,7 +49,7 @@ export default {
if (!this.newGroupName) { if (!this.newGroupName) {
this.newGroupNameError = "Group name is required"; this.newGroupNameError = "Group name is required";
} else { } else {
client.addGroup(this.newGroupName, this.leaf, this.$store.state.input) client.addGroup(this.newGroupName, !this.allowChildGroups, this.$store.state.input)
.then(res => { .then(res => {
this.$store.commit('updateGroupsPanel', res); this.$store.commit('updateGroupsPanel', res);
this.$bvModal.hide('add-group-modal'); this.$bvModal.hide('add-group-modal');
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<b-form-input v-model="newGroupName" id="new-group-name-input" class="w-75" aria-describedby="new-group-name-input-feedback" :state="newGroupNameState" v-on:input="resetError"> <b-form-input v-model="newGroupName" id="new-group-name-input" class="w-75" aria-describedby="new-group-name-input-feedback" :state="newGroupNameState" v-on:input="resetError">
</b-form-input> </b-form-input>
<b-form-invalid-feedback id="new-group-name-input-feedback" class="text-right">{{newGroupNameError}}</b-form-invalid-feedback> <b-form-invalid-feedback id="new-group-name-input-feedback" class="text-right">{{newGroupNameError}}</b-form-invalid-feedback>
<b-form-checkbox class="mt-3 ml-3" v-model="leaf">is leaf</b-form-checkbox> <b-form-checkbox class="mt-3 ml-3" v-model="allowChildGroups">allow child groups</b-form-checkbox>
</b-form> </b-form>
</b-modal> </b-modal>
</template> </template>
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
oldGroupName: '', oldGroupName: '',
newGroupName: '', newGroupName: '',
newGroupNameError: '', newGroupNameError: '',
leaf: false allowChildGroups: false
}; };
}, },
methods: { methods: {
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
openEditGroupModal: function(group) { openEditGroupModal: function(group) {
this.newGroupName = group.groupName; this.newGroupName = group.groupName;
this.groupId = group.groupId; this.groupId = group.groupId;
this.leaf = group.leaf; this.allowChildGroups = !group.leaf;
this.$bvModal.show('edit-group-modal'); this.$bvModal.show('edit-group-modal');
}, },
updateGroup: function(event) { updateGroup: function(event) {
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
return; return;
} }
client.updateGroup(this.groupId, this.newGroupName, this.leaf, this.$store.state.input) client.updateGroup(this.groupId, this.newGroupName, !this.allowChildGroups, this.$store.state.input)
.then(res => { .then(res => {
this.$store.commit('updateGroupsPanel', res); this.$store.commit('updateGroupsPanel', res);
this.$bvModal.hide('edit-group-modal'); this.$bvModal.hide('edit-group-modal');
......
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
<img src="img/gms-admin-add-group-modal.jpg" alt="" class="mb-3" /> <img src="img/gms-admin-add-group-modal.jpg" alt="" class="mb-3" />
</p> </p>
<p>If you select the "is leaf" checkbox, the group will be a leaf of the tree: this means that <p>If you select the "allow child groups" checkbox it will be possible to create sub-groups inside it.
it will not be possible to create sub-groups inside it. You can change this setting in any moment You can change this setting in any moment clicking on the "Edit group" button (pencil icon
clicking on the "Edit group" button (pencil icon <img src="img/pencil-icon.jpg" alt="" />).</p> <img src="img/pencil-icon.jpg" alt="" />).</p>
<p>You can delete groups using trash icons (<img src="img/trash-icon.jpg" alt="" />). <p>You can delete groups using trash icons (<img src="img/trash-icon.jpg" alt="" />).
A dialog will ask for confirming the operation before deleting the group.</p> A dialog will ask for confirming the operation before deleting the group.</p>
......
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
If multiple users need to manage memberships of the same group you can ask administrators to enable them. If multiple users need to manage memberships of the same group you can ask administrators to enable them.
</p> </p>
<p><strong>IMPORTANT</strong>: A user is searchable after he/she has performed the first login on one
of our services. Check <a href="https://sso.ia2.inaf.it/" target="blank_">SSO help page</a>
for more information about IA2 authentication.</p>
<p>You can delete memberships using the trash icons (<img src="img/trash-icon.jpg" alt="" />). <p>You can delete memberships using the trash icons (<img src="img/trash-icon.jpg" alt="" />).
<h2 class="mt-4">Seeing information about users</h2> <h2 class="mt-4">Seeing information about users</h2>
......
gms/src/main/resources/static/help/img/gms-admin-add-group-modal.jpg

17.9 KiB | W: | H:

gms/src/main/resources/static/help/img/gms-admin-add-group-modal.jpg

25.2 KiB | W: | H:

gms/src/main/resources/static/help/img/gms-admin-add-group-modal.jpg
gms/src/main/resources/static/help/img/gms-admin-add-group-modal.jpg
gms/src/main/resources/static/help/img/gms-admin-add-group-modal.jpg
gms/src/main/resources/static/help/img/gms-admin-add-group-modal.jpg
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment