From d2867aa138f50d5394bde19e1cbe98f01fe8873b Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 23 Jul 2015 18:22:43 +0530
Subject: [PATCH] UX: show pending invites tab by default
---
.../javascripts/discourse/routes/user-invited-index.js.es6 | 2 +-
.../javascripts/discourse/routes/user-invited-show.js.es6 | 6 ++++++
.../javascripts/discourse/templates/user-invited-show.hbs | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
index e11dea722ec..df9e7fadcfb 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
@@ -1,5 +1,5 @@
export default Discourse.Route.extend({
beforeModel: function() {
- this.replaceWith('userInvited.show', 'redeemed');
+ this.replaceWith('userInvited.show', 'pending');
}
});
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
index a5e391093f8..6c42105dd64 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
@@ -8,6 +8,12 @@ export default Discourse.Route.extend(ShowFooter, {
return Discourse.Invite.findInvitedBy(this.modelFor('user'), params.filter);
},
+ afterModel: function(model) {
+ if (!model.can_see_invite_details) {
+ this.replaceWith('userInvited.show', 'redeemed');
+ }
+ },
+
setupController(controller, model) {
controller.setProperties({
model: model,
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index f591b52d250..d19f12132cb 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -6,8 +6,8 @@
<div class='user-invite-controls'>
<div class='span15'>
<ul class="nav nav-pills">
- {{nav-item route='userInvited.show' routeParam='redeemed' label='user.invited.redeemed_tab'}}
{{nav-item route='userInvited.show' routeParam='pending' label='user.invited.pending_tab'}}
+ {{nav-item route='userInvited.show' routeParam='redeemed' label='user.invited.redeemed_tab'}}
</ul>
</div>