Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] No new room created when conversation is closed #13753

Merged
merged 6 commits into from
Mar 18, 2019
Merged

[FIX] No new room created when conversation is closed #13753

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae9533f
Fixed livechat closed room
knrt10 Mar 17, 2019
2992a94
Fixed some analytics CSS
knrt10 Mar 17, 2019
ec060ec
Fixed for API
knrt10 Mar 17, 2019
bc2f5d4
Merge branch 'develop' into issue13733
renatobecker Mar 18, 2019
e205d9f
Merge branch 'develop' into issue13733
renatobecker Mar 18, 2019
bc103db
Merge branch 'develop' into issue13733
renatobecker Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/livechat/client/stylesheets/livechat.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,10 @@
// flex: 1;
}

.border-component-td {
padding: 0.5rem;
}

.lc-analytics-chart-container {
// flex-grow: 100%;
flex: auto;
Expand Down
4 changes: 2 additions & 2 deletions app/livechat/client/views/app/analytics/livechatAnalytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<tbody>
{{#each data}}
<tr>
<td class="border-component-color">{{name}}</td>
<td class="border-component-color border-component-td">{{name}}</td>
<td class="border-component-color">{{value}}</td>
</tr>
{{/each}}
Expand All @@ -97,4 +97,4 @@
</div>
</div>
{{/requiresPermission}}
</template>
</template>
4 changes: 4 additions & 0 deletions app/livechat/server/api/v1/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ API.v1.addRoute('livechat/message', {
throw new Meteor.Error('invalid-room');
}

if (!room.open) {
throw new Meteor.Error('room-closed');
}

const _id = this.bodyParams._id || Random.id();

const sendMessage = {
Expand Down