Skip to content

[FIX] Button to delete rooms by the owners wasn't appearing #10438

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

Merged
rodrigok merged 2 commits into from
Apr 16, 2018
Merged

[FIX] Button to delete rooms by the owners wasn't appearing #10438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6b1d8b
added delete channel button
ggazzo Apr 12, 2018
9023436
Merge branch 'develop' into delete-p-rooms
karlprieb Apr 15, 2018
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
6 changes: 3 additions & 3 deletions packages/rocketchat-channel-settings/client/views/channelSettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ <h3 title="{{name}}" class="rc-user-info__name">{{> icon block="rc-header__icon"
{{#if canLeaveRoom}}
<button class="rc-button rc-button--icon rc-button--outline rc-button--cancel js-leave">{{> icon icon='sign-out'}}{{_ 'Leave'}}</button>
{{/if}}
<!-- {{#if canDeleteRoom}}
<button class="rc-button rc-button-outline rc-button-cancel js-delete" title="{{_ 'Delete'}}">{{> icon icon='trash'}}{{_ 'Delete'}}</button>
{{/if}} -->
</div>
{{#if canDeleteRoom}}
<button class="rc-button rc-button-outline rc-button-cancel js-delete rc-button--cancel rc-button--stack" title="{{_ 'Delete'}}">{{> icon icon='trash'}}{{_ 'Delete'}}</button>
{{/if}}
</template>
2 changes: 1 addition & 1 deletion packages/rocketchat-channel-settings/client/views/channelSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const common = {
});

const roomType = room && room.t;
return roomType && RocketChat.roomTypes.roomTypes[room.t].canBeDeleted(room);
return roomType && RocketChat.roomTypes.roomTypes[roomType].canBeDeleted(room);
},
canEditRoom() {
const { _id } = Template.instance().room;
Expand Down
9 changes: 8 additions & 1 deletion packages/rocketchat-theme/client/imports/forms/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
}

&--icon > svg {
margin: 0 5px;
margin: 0 5px 0 -5px;

.rtl & {
margin: 0 -5px 0 5px;
}

font-size: 20px;
fill: currentColor;
Expand Down Expand Up @@ -107,6 +111,9 @@
border-style: solid;
background: transparent;
}
&--stack {
width: 100%;
}

&.loading {
position: relative;
Expand Down