mirror of
https://github.com/discourse/discourse.git
synced 2025-02-08 04:18:23 +00:00
missing bits from user page rediscovered
This commit is contained in:
parent
28d111d370
commit
4bd4e4e1c7
@ -34,9 +34,13 @@ Discourse.User = Discourse.Model.extend({
|
|||||||
@property websiteName
|
@property websiteName
|
||||||
@type {String}
|
@type {String}
|
||||||
**/
|
**/
|
||||||
websiteName: (function() {
|
websiteName: function() {
|
||||||
return this.get('website').split("/")[2];
|
return this.get('website').split("/")[2];
|
||||||
}).property('website'),
|
}.property('website'),
|
||||||
|
|
||||||
|
hasWebsite: function() {
|
||||||
|
return this.present('website');
|
||||||
|
}.property('website'),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Path to this user.
|
Path to this user.
|
||||||
@ -334,6 +338,7 @@ Discourse.User = Discourse.Model.extend({
|
|||||||
|
|
||||||
onDetailsLoaded: function(callback){
|
onDetailsLoaded: function(callback){
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
this.set("loading",false);
|
||||||
|
|
||||||
if(callback){
|
if(callback){
|
||||||
this.onDetailsLoadedCallbacks = this.onDetailsLoadedCallbacks || [];
|
this.onDetailsLoadedCallbacks = this.onDetailsLoadedCallbacks || [];
|
||||||
@ -353,6 +358,7 @@ Discourse.User = Discourse.Model.extend({
|
|||||||
**/
|
**/
|
||||||
loadDetails: function() {
|
loadDetails: function() {
|
||||||
|
|
||||||
|
this.set("loading",true);
|
||||||
// Check the preload store first
|
// Check the preload store first
|
||||||
var user = this;
|
var user = this;
|
||||||
var username = this.get('username');
|
var username = this.get('username');
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
<div class='show'>
|
<div class='show'>
|
||||||
<dl>
|
<dl>
|
||||||
{{#if content.website}}
|
{{#if content.hasWebsite}}
|
||||||
<dt>{{i18n user.website}}:</dt><dd><a {{bindAttr href="content.website"}} target="_blank">{{content.websiteName}}</a></dd>
|
<dt>{{i18n user.website}}:</dt><dd><a {{bindAttr href="content.website"}} target="_blank">{{content.websiteName}}</a></dd>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<dt>{{i18n user.created}}:</dt><dd>{{date content.created_at}}</dd>
|
<dt>{{i18n user.created}}:</dt><dd>{{date content.created_at}}</dd>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
{{#unless content.loading}}
|
||||||
<div class="user-heading">
|
<div class="user-heading">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="full-width" id='user-menu'>
|
<div class="full-width" id='user-menu'>
|
||||||
@ -43,4 +44,4 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
{{outlet userOutlet}}
|
{{outlet userOutlet}}
|
||||||
</div>
|
</div>
|
||||||
|
{{/unless}}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user