From e26cba062bd05cbece70bd21c09be8abd54d96d0 Mon Sep 17 00:00:00 2001
From: Shubham Dhama <shubhamdhamaofficial@gmail.com>
Date: Thu, 3 Jan 2019 21:29:21 +0530
Subject: [PATCH] settings_invites: Add invited_as column to the table.

This makes it possible to review the roles used in active invitations.
---
 static/js/settings_invites.js                 | 28 +++++++++++++++++++
 .../templates/admin_invites_list.handlebars   |  3 ++
 .../settings/invites-list-admin.handlebars    |  3 +-
 zerver/models.py                              |  3 ++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/static/js/settings_invites.js b/static/js/settings_invites.js
index f54fb8a025..d5bc45f63f 100644
--- a/static/js/settings_invites.js
+++ b/static/js/settings_invites.js
@@ -15,10 +15,38 @@ function failed_listing_invites(xhr) {
     ui_report.error(i18n.t("Error listing invites"), xhr, $("#organization-status"));
 }
 
+exports.invited_as_values = {
+    member: {
+        value: 1,
+        description: i18n.t("Member"),
+    },
+    admin_user: {
+        value: 2,
+        description: i18n.t("Organization administrator"),
+    },
+    guest_user: {
+        value: 3,
+        description: i18n.t("Guest user"),
+    },
+};
+
+function add_invited_as_text(invites) {
+    invites.forEach(data => {
+        var invited_as_type = _.findKey(exports.invited_as_values, function (elem) {
+            return elem.value === data.invited_as;
+        });
+        data.invited_as_text = exports.invited_as_values[invited_as_type].description;
+    });
+}
+
+
 function populate_invites(invites_data) {
     if (!meta.loaded) {
         return;
     }
+
+    add_invited_as_text(invites_data.invites);
+
     var invites_table = $("#admin_invites_table").expectOne();
 
     var admin_invites_list = list_render.get("admin_invites_list");
diff --git a/static/templates/admin_invites_list.handlebars b/static/templates/admin_invites_list.handlebars
index 54547d590e..bf6c23d0c1 100644
--- a/static/templates/admin_invites_list.handlebars
+++ b/static/templates/admin_invites_list.handlebars
@@ -12,6 +12,9 @@
     <td>
         <span class="invited_at">{{invited}}</span>
     </td>
+    <td>
+        <span>{{invited_as_text}}</span>
+    </td>
     <td>
         <button class="button rounded small revoke btn-danger" data-invite-id="{{id}}">
             {{t "Revoke" }}
diff --git a/static/templates/settings/invites-list-admin.handlebars b/static/templates/settings/invites-list-admin.handlebars
index 543edd3195..5b5f4a1ad6 100644
--- a/static/templates/settings/invites-list-admin.handlebars
+++ b/static/templates/settings/invites-list-admin.handlebars
@@ -9,7 +9,8 @@
                 <th>{{t "Email" }}</th>
                 <th>{{t "Invited by" }}</th>
                 <th>{{t "Invited at" }}</th>
-                <th class="actions">{{t "Actions" }}</th>
+                <th>{{t "Invited as" }}</th>
+                <th>{{t "Actions" }}</th>
             </thead>
             <tbody id="admin_invites_table" class="required-text thick admin_invites_table" data-empty="{{t 'No invites match your current filter.' }}"></tbody>
         </table>
diff --git a/zerver/models.py b/zerver/models.py
index 2b65b4da09..0ba244808d 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -1047,6 +1047,9 @@ class PreregistrationUser(models.Model):
 
     realm = models.ForeignKey(Realm, null=True, on_delete=CASCADE)  # type: Optional[Realm]
 
+    # Changes to INVITED_AS should also be reflected in
+    # settings_invites.invited_as_values in
+    # static/js/settings_invites.js
     INVITE_AS = dict(
         MEMBER = 1,
         REALM_ADMIN = 2,