Skip to content

Commit

Permalink
Merge pull request #112 from modoboa/fix/filter_by_category
Browse files Browse the repository at this point in the history
Fixed filtering by category.
  • Loading branch information
tonioo committed Jan 24, 2023
2 parents 4b47d0f + ff554f0 commit c7729b6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions frontend/src/components/ContactList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default {
])
},
created () {
this.getContacts(this.$route.params)
this.getContacts(undefined, this.$route.params.category)
api.getDefaultAddressBook().then(response => {
this.addressBook = response.data
})
Expand Down Expand Up @@ -121,7 +121,7 @@ export default {
},
watch: {
'$route' (to, from) {
this.getContacts(this.$route.params)
this.getContacts(undefined, this.$route.params.category)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/PhoneNumberField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default {
},
data: function () {
return {
types: ['cellular', 'fax', 'home', 'main', 'pager', 'work', 'other']
types: ['cell', 'fax', 'home', 'main', 'pager', 'work', 'other']
}
},
computed: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/tests/unit/PhoneNumberField.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('PhoneNumberField.vue', () => {
const Ctor = Vue.extend(PhoneNumberField)
const vm = new Ctor({
propsData: {
index: 0, errors: {}, phone: { number: '0123456789', type: 'cellular' }
index: 0, errors: {}, phone: { number: '0123456789', type: 'cell' }
}
}).$mount()
expect(vm.$el).to.be.ok // eslint-disable-line no-unused-expressions
Expand Down
2 changes: 1 addition & 1 deletion modoboa_contacts/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
("work", ugettext_lazy("Work")),
("other", ugettext_lazy("Other")),
("main", ugettext_lazy("Main")),
("cellular", ugettext_lazy("Cellular")),
("cell", ugettext_lazy("Cellular")),
("fax", ugettext_lazy("Fax")),
("pager", ugettext_lazy("Pager"))
)
Expand Down

0 comments on commit c7729b6

Please sign in to comment.