mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: Fixed deleted posts layout (#7348)
This commit is contained in:
parent
cab83596ec
commit
fe9c271d44
@ -8,6 +8,16 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
|
|||||||
import { getOwner } from "discourse-common/lib/get-owner";
|
import { getOwner } from "discourse-common/lib/get-owner";
|
||||||
|
|
||||||
export default Ember.Component.extend(LoadMore, {
|
export default Ember.Component.extend(LoadMore, {
|
||||||
|
_initialize: function() {
|
||||||
|
const filter = this.get("stream.filter");
|
||||||
|
if (filter) {
|
||||||
|
this.set("classNames", [
|
||||||
|
"user-stream",
|
||||||
|
"filter-" + filter.toString().replace(",", "-")
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}.on("init"),
|
||||||
|
|
||||||
loading: false,
|
loading: false,
|
||||||
eyelineSelector: ".user-stream .item",
|
eyelineSelector: ".user-stream .item",
|
||||||
classNames: ["user-stream"],
|
classNames: ["user-stream"],
|
||||||
|
@ -193,7 +193,7 @@
|
|||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{#if canDeleteUser}}
|
{{#if canDeleteUser}}
|
||||||
<div>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
|
<div class='pull-right'>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</dl>
|
</dl>
|
||||||
{{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
|
{{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
.user-stream {
|
||||||
|
&.filter-deleted {
|
||||||
|
grid-column-start: 1;
|
||||||
|
grid-column-end: 3;
|
||||||
|
grid-row-start: 2;
|
||||||
|
}
|
||||||
|
}
|
@ -27,6 +27,8 @@ QUnit.test("Filters", async assert => {
|
|||||||
|
|
||||||
await visit("/u/eviltrout/activity/replies");
|
await visit("/u/eviltrout/activity/replies");
|
||||||
hasStream(assert);
|
hasStream(assert);
|
||||||
|
|
||||||
|
assert.ok(exists(".user-stream.filter-5"), "stream has filter class");
|
||||||
});
|
});
|
||||||
|
|
||||||
QUnit.test("Badges", async assert => {
|
QUnit.test("Badges", async assert => {
|
||||||
|
Loading…
Reference in New Issue
Block a user