FIX: reverts href removal from user/group cards links (#7318)

This commit is contained in:
Joffrey JAFFEUX 2019-04-03 19:16:48 +02:00 committed by GitHub
parent 1bce97a596
commit 974007a3cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions

View File

@ -167,12 +167,9 @@ export default Ember.Component.extend(
.finally(() => this.set("loading", null)); .finally(() => this.set("loading", null));
}, },
didInsertElement() {
this._super(...arguments);
},
_close() { _close() {
this._super(...arguments); this._super(...arguments);
this.setProperties({ this.setProperties({
user: null, user: null,
topicPostCount: null topicPostCount: null

View File

@ -3,7 +3,7 @@
<div class="card-row first-row"> <div class="card-row first-row">
<div class="group-card-avatar"> <div class="group-card-avatar">
<a href {{action "showGroup" group}} class="card-huge-avatar"> <a href="{{groupPath}}" {{action "showGroup" group}} class="card-huge-avatar">
{{avatar-flair {{avatar-flair
flairURL=group.flair_url flairURL=group.flair_url
flairBgColor=group.flair_bg_color flairBgColor=group.flair_bg_color
@ -14,7 +14,7 @@
<div class="names"> <div class="names">
<span> <span>
<h1 class="{{group.name}}"> <h1 class="{{group.name}}">
<a href {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a> <a href="{{groupPath}}" {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
</h1> </h1>
{{#if group.full_name}} {{#if group.full_name}}
<h2 class='full-name'>{{group.full_name}}</h2> <h2 class='full-name'>{{group.full_name}}</h2>
@ -74,7 +74,7 @@
<a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a> <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
{{/each}} {{/each}}
{{#if showMoreMembers}} {{#if showMoreMembers}}
<a href {{action "showGroup" group}} class="more-members-link"><span <a href="{{groupPath}}" {{action "showGroup" group}} class="more-members-link"><span
class="more-members-count">+{{moreMembersCount}} class="more-members-count">+{{moreMembersCount}}
{{i18n "more"}}</span></a> {{i18n "more"}}</span></a>
{{/if}} {{/if}}

View File

@ -6,7 +6,7 @@
{{#if user.profile_hidden}} {{#if user.profile_hidden}}
<span class="card-huge-avatar">{{bound-avatar user "huge"}}</span> <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
{{else}} {{else}}
<a href {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a> <a href="{{user.path}}" {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
{{/if}} {{/if}}
{{#if user.primary_group_name}} {{#if user.primary_group_name}}
{{avatar-flair {{avatar-flair
@ -26,7 +26,7 @@
{{user-status user currentUser=currentUser}} {{user-status user currentUser=currentUser}}
</span> </span>
{{else}} {{else}}
<a href {{action "showUser" user}} class='user-profile-link'> <a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
{{if nameFirst user.name (format-username username)}} {{if nameFirst user.name (format-username username)}}
{{user-status user currentUser=currentUser}} {{user-status user currentUser=currentUser}}
</a> </a>
@ -221,4 +221,4 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}