Commit 7c5f5d5c authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Bugfix on permission removal; various small improvements

parent a4fb3285

gms-ui/src/components/GenericSearchResults.vue

+1 −4
Original line number Diff line number Diff line
@@ -39,10 +39,7 @@ export default { 
          this.$store.commit('openGroup', result.id);

          break;

        case 'USER':

          client.openUserSearchResult(result.id)

            .then(model => {

              this.$store.commit('displayUserSearchResults', [result.label, model]);

            });

          this.$store.dispatch('openUserPage', result.id);

          break;

      }

    },

gms-ui/src/components/Main.vue

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ export default { 
  }),

  methods: {

    tabChanged: function(tabIndex) {

      // reset paginator

      this.input.paginatorPage = 1;

      switch (tabIndex) {

        case 0:

          client.fetchGroupsTab(this.input)

gms-ui/src/components/MembersPanel.vue

+5 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
<b-tab title="Members" v-if="model.permission === 'ADMIN' || model.permission === 'MANAGE_MEMBERS' || model.permission === 'VIEW_MEMBERS'">

  <div v-if="model.membersPanel !== null">

    <b-list-group v-for="member in model.membersPanel.items" id="members-list">

      <b-list-group-item href="#">

      <b-list-group-item href="#" @click="openUser(member)">

        <div class="float-left">

          <User v-bind:user="member" />

          <User :user="member" :anchor="false" />

        </div>

        <span v-if="model.permission === 'ADMIN' || model.permission === 'MANAGE_MEMBERS'" class="float-right">

          <a href="#" v-on:click.stop="openRemoveMemberModal(member)" class="text-danger" title="Remove member">
@@ -52,6 +52,9 @@ export default { 
        .then(panel => {

          this.$store.commit('updateMembersPanel', panel);

        });

    },

    openUser(member) {

      this.$store.dispatch('openUserPage', member.id);

    }

  }

}

gms-ui/src/components/PermissionsPanel.vue

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
      <tbody>

        <tr v-for="up in model.permissionsPanel.items">

          <td>

            <User v-bind:user="up.user" />

            <User :user="up.user" :anchor="true" />

          </td>

          <td>{{up.permission}}</td>

          <td>

gms-ui/src/components/User.vue

+9 −3
Original line number Diff line number Diff line 
<template>

<div :id="'user-name-' + user.id">

  <span>{{user.displayName}}</span>

  <component :is="anchor ? 'a' : 'span'" :href="anchor ? '#' : false" @click="openUser">{{user.displayName}}</component>

  <b-tooltip ref="user-tooltip" :target="'user-name-' + user.id" placement="bottom">

    <div class="text-left">

      <p><strong>User id</strong>: {{user.id}}</p>

      <p><strong>Identities</strong>:</p>

      <ul>

        <li v-for="identity in user.identities">

        <li v-for="identity in user.identities" v-bind:key="identity.typedId">

          {{identity.email}} ({{identity.type}})

        </li>

      </ul>
@@ -19,7 +19,13 @@ 
export default {

  name: 'User',

  props: {

    user: Object

    user: Object,

    anchor: Boolean

  },

  methods: {

    openUser() {

      this.$store.dispatch('openUserPage', this.user.id);

    }

  }

}

</script>