Skip to content

Commit c7729b6

Browse files
authored
Merge pull request #112 from modoboa/fix/filter_by_category
Fixed filtering by category.
2 parents 4b47d0f + ff554f0 commit c7729b6

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

frontend/src/components/ContactList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default {
8484
])
8585
},
8686
created () {
87-
this.getContacts(this.$route.params)
87+
this.getContacts(undefined, this.$route.params.category)
8888
api.getDefaultAddressBook().then(response => {
8989
this.addressBook = response.data
9090
})
@@ -121,7 +121,7 @@ export default {
121121
},
122122
watch: {
123123
'$route' (to, from) {
124-
this.getContacts(this.$route.params)
124+
this.getContacts(undefined, this.$route.params.category)
125125
}
126126
}
127127
}

frontend/src/components/PhoneNumberField.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
},
3131
data: function () {
3232
return {
33-
types: ['cellular', 'fax', 'home', 'main', 'pager', 'work', 'other']
33+
types: ['cell', 'fax', 'home', 'main', 'pager', 'work', 'other']
3434
}
3535
},
3636
computed: {

frontend/tests/unit/PhoneNumberField.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('PhoneNumberField.vue', () => {
1616
const Ctor = Vue.extend(PhoneNumberField)
1717
const vm = new Ctor({
1818
propsData: {
19-
index: 0, errors: {}, phone: { number: '0123456789', type: 'cellular' }
19+
index: 0, errors: {}, phone: { number: '0123456789', type: 'cell' }
2020
}
2121
}).$mount()
2222
expect(vm.$el).to.be.ok // eslint-disable-line no-unused-expressions

modoboa_contacts/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
("work", ugettext_lazy("Work")),
1414
("other", ugettext_lazy("Other")),
1515
("main", ugettext_lazy("Main")),
16-
("cellular", ugettext_lazy("Cellular")),
16+
("cell", ugettext_lazy("Cellular")),
1717
("fax", ugettext_lazy("Fax")),
1818
("pager", ugettext_lazy("Pager"))
1919
)

0 commit comments

Comments
 (0)