- Displaying reason on user info

- Reason displayed only if setting is active and user is not active
- Added reason to getFullUserData

packages/rocketchat-lib/server/functions/getFullUserData.js

@@ -6,7 +6,8 @@ RocketChat.getFullUserData = function({userId, filter, limit}) {
 		status: 1,
 		utcOffset: 1,
 		type: 1,
-		active: 1
+		active: 1,
+		reason: 1
 	};
 
 	if (RocketChat.authz.hasPermission(userId, 'view-full-other-user-info')) {

packages/rocketchat-lib/server/models/Users.js

@@ -9,6 +9,7 @@ class ModelUsers extends RocketChat.models._Base {
 		this.tryEnsureIndex({ 'active': 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ 'statusConnection': 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ 'type': 1 });
+		this.tryEnsureIndex({ 'reason': 1 });
 
 		this.cache.ensureIndex('username', 'unique');
 	}

packages/rocketchat-ui-flextab/client/tabs/userInfo.html

@@ -26,7 +26,7 @@
 						{{#if hasPhone}}
 							{{#each phone}} <p class="secondary-font-color"><i class="icon-phone"></i> {{phoneNumber}}</p> {{/each}}
 						{{/if}}
-						{{#if lastLogin}} <p class="secondary-font-color"><i class="icon-calendar"></i> {{_ "Created_at"}}: {{createdAt}}</p> {{/if}}
+						{{#if createdAt}} <p class="secondary-font-color"><i class="icon-calendar"></i> {{_ "Created_at"}}: {{createdAt}}</p> {{/if}}
 						{{#if lastLogin}} <p class="secondary-font-color"><i class="icon-calendar"></i> {{_ "Last_login"}}: {{lastLogin}}</p> {{/if}}
 						{{#if services.facebook.id}} <p class="secondary-font-color"><i class="icon-facebook"></i><a href="{{services.facebook.link}}" target="_blank">{{services.facebook.name}}</a></p> {{/if}}
 						{{#if services.github.id}} <p class="secondary-font-color"><i class="icon-github-circled"></i><a href="https://www.github.com/{{services.github.username}}" target="_blank">{{services.github.username}}</a></p> {{/if}}
@@ -37,6 +37,11 @@
 						{{#if services.twitter.id}} <p class="secondary-font-color"><i class="icon-twitter"></i><a href="https://twitter.com/{{services.twitter.screenName}}" target="_blank">{{services.twitter.screenName}}</a></p> {{/if}}
 						{{#if services.wordpress.id}} <p class="secondary-font-color"><i class="icon-wordpress"></i>{{services.wordpress.user_login}}</p> {{/if}}
 					{{/if}}
+					{{#if shouldDisplayReason}}
+						<p class="secondary-font-color">
+							{{_ "Reason_To_Join"}}: {{user.reason}}
+						</p>
+					{{/if}}
 				</div>
 			</div>
 			{{/with}}

packages/rocketchat-ui-flextab/client/tabs/userInfo.js

@@ -180,6 +180,11 @@ Template.userInfo.helpers({
 	isBlocker() {
 		const subscription = ChatSubscription.findOne({rid:Session.get('openedRoom'), 'u._id': Meteor.userId()}, { fields: { blocker: 1 } });
 		return subscription.blocker;
+	},
+
+	shouldDisplayReason() {
+		const user = Template.instance().user.get();
+		return RocketChat.settings.get('Accounts_ManuallyApproveNewUsers') && user.active === false;
 	}
 });