Skip to content

Commit

Permalink
Merge branch 'release/v1.24.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
appsol committed Nov 10, 2023
2 parents eeee2f0 + e69ae73 commit b832c25
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.DS_Store
node_modules
/dist

/src/assets/*
/tests/e2e/reports/
selenium-debug.log

Expand Down
6 changes: 3 additions & 3 deletions src/views/users/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
</template>

<script>
import Auth from "@/classes/Auth";
import CkResourceListingTable from "@/components/Ck/CkResourceListingTable.vue";
import CkTableFilters from "@/components/Ck/CkTableFilters.vue";
Expand All @@ -151,7 +150,6 @@ export default {
components: { CkResourceListingTable, CkTableFilters },
data() {
return {
auth: Auth,
filters: {
first_name: "",
last_name: "",
Expand All @@ -169,7 +167,9 @@ export default {
},
computed: {
roles() {
return Auth.roles.slice().unshift({ value: "", text: "All" });
const roles = this.auth.roles.slice();
roles.splice(0, 0, { text: "All", value: "" });
return roles;
},
params() {
const params = {
Expand Down

0 comments on commit b832c25

Please sign in to comment.