KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into fix/6020_docker_build_failure

Browse source
This commit is contained in:
Sojan Jose 2022-12-07 16:47:29 +03:00 committed by GitHub
commit b3054a8ad6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/dashboard/components/ChatList.vue
View file

@ -345,6 +345,9 @@ export default {
}; };
}, },
pageTitle() { pageTitle() {
if (this.hasAppliedFilters) {
return this.$t('CHAT_LIST.TAB_HEADING');
}
if (this.inbox.name) { if (this.inbox.name) {
return this.inbox.name; return this.inbox.name;
} }
@ -439,9 +442,6 @@ export default {
}, },
methods: { methods: {
onApplyFilter(payload) { onApplyFilter(payload) {
if (this.$route.name !== 'home') {
this.$router.push({ name: 'home' });
}
this.resetBulkActions(); this.resetBulkActions();
this.foldersQuery = filterQueryGenerator(payload); this.foldersQuery = filterQueryGenerator(payload);
this.$store.dispatch('conversationPage/reset'); this.$store.dispatch('conversationPage/reset');

3
app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
View file

@ -112,6 +112,7 @@ $label-badge-size: var(--space-slab);
padding: var(--space-smaller) var(--space-smaller); padding: var(--space-smaller) var(--space-smaller);
margin: var(--space-smaller) 0; margin: var(--space-smaller) 0;
text-align: left; text-align: left;
line-height: 1.2;
&:hover { &:hover {
background: var(--s-25); background: var(--s-25);
@ -135,8 +136,6 @@ $label-badge-size: var(--space-slab);
.menu-label { .menu-label {
flex-grow: 1; flex-grow: 1;
display: inline-flex;
align-items: center;
} }
.inbox-icon { .inbox-icon {

6
yarn.lock
View file

@ -12962,9 +12962,9 @@ qs@^6.10.0:
side-channel "^1.0.4" side-channel "^1.0.4"
qs@~6.5.2: qs@~6.5.2:
version "6.5.2" version "6.5.3"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
query-string@^4.1.0: query-string@^4.1.0:
version "4.3.4" version "4.3.4"