diff --git a/static/js/admin.js b/static/js/admin.js index a840384686..bde2019ad7 100644 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -75,7 +75,8 @@ exports.setup_page = function () { realm_name: page_params.realm_name, domain: page_params.domain, realm_restricted_to_domain: page_params.realm_restricted_to_domain, - realm_invite_required: page_params.realm_invite_required + realm_invite_required: page_params.realm_invite_required, + realm_invite_by_admins_only: page_params.realm_invite_by_admins_only }; var admin_tab = templates.render('admin_tab', options); $("#administration").html(admin_tab); @@ -83,6 +84,7 @@ exports.setup_page = function () { $("#admin-realm-name-status").hide(); $("#admin-realm-restricted-to-domain-status").hide(); $("#admin-realm-invite-required-status").hide(); + $("#admin-realm-invite-by-admins-only").hide(); // create loading indicators loading.make_indicator($('#admin_page_users_loading_indicator')); @@ -172,26 +174,40 @@ exports.setup_page = function () { }); }); + $("#id_realm_invite_required").change(function () { + if(this.checked) { + $("#id_realm_invite_by_admins_only").removeAttr("disabled"); + $("#id_realm_invite_by_admins_only_label").removeClass("control-label-disabled"); + } else { + $("#id_realm_invite_by_admins_only").attr("disabled", true); + $("#id_realm_invite_by_admins_only_label").addClass("control-label-disabled"); + } + }); + $(".administration").on("submit", "form.admin-realm", function (e) { var name_status = $("#admin-realm-name-status").expectOne(); var restricted_to_domain_status = $("#admin-realm-restricted-to-domain-status").expectOne(); var invite_required_status = $("#admin-realm-invite-required-status").expectOne(); + var invite_by_admins_only_status = $("#admin-realm-invite-by-admins-only-status").expectOne(); name_status.hide(); restricted_to_domain_status.hide(); invite_required_status.hide(); + invite_by_admins_only_status.hide(); - e.preventDefault(); + e.preventDefault(); e.stopPropagation(); var new_name = $("#id_realm_name").val(); var new_restricted = $("#id_realm_restricted_to_domain").prop("checked"); var new_invite = $("#id_realm_invite_required").prop("checked"); + var new_invite_by_admins_only = $("#id_realm_invite_by_admins_only").prop("checked"); var url = "/json/realm"; var data = { name: JSON.stringify(new_name), restricted_to_domain: JSON.stringify(new_restricted), - invite_required: JSON.stringify(new_invite) + invite_required: JSON.stringify(new_invite), + invite_by_admins_only: JSON.stringify(new_invite_by_admins_only) }; channel.patch({ @@ -211,12 +227,20 @@ exports.setup_page = function () { } if (data.invite_required !== undefined) { if (data.invite_required) { - ui.report_success("New users must be invited by e-mil!", invite_required_status); + ui.report_success("New users must be invited by e-mail!", invite_required_status); } else { ui.report_success("New users may sign up online!", invite_required_status); } } + if (data.invite_by_admins_only !== undefined) { + if (data.invite_by_admins_only) { + ui.report_success("New users must be invited by an admin!", invite_by_admins_only_status); + } + else { + ui.report_success("Any user may now invite new users!", invite_by_admins_only_status); + } + } }, error: function (xhr, error) { ui.report_error("Failed!", xhr, name_status); diff --git a/static/js/server_events.js b/static/js/server_events.js index 74d18d66a4..4504bb9ec2 100644 --- a/static/js/server_events.js +++ b/static/js/server_events.js @@ -78,6 +78,8 @@ function get_events_success(events) { notifications.redraw_title(); } else if (event.op === 'update' && event.property === 'invite_required') { page_params.realm_invite_required = event.value; + } else if (event.op === 'update' && event.property === 'invite_by_admins_only') { + page_params.realm_invite_by_admins_only = event.value; } else if (event.op === 'update' && event.property === 'restricted_to_domain') { page_params.realm_restricted_to_domain = event.value; } diff --git a/static/styles/zulip.css b/static/styles/zulip.css index 71a31afc5c..528386b496 100644 --- a/static/styles/zulip.css +++ b/static/styles/zulip.css @@ -3647,6 +3647,10 @@ form.admin-realm .control-label { margin-bottom: -20px; } +.control-label-disabled { + color: #d3d3d3; +} + .zero_count { display: none; } diff --git a/static/templates/admin_tab.handlebars b/static/templates/admin_tab.handlebars index 977af7f319..0706858ae2 100644 --- a/static/templates/admin_tab.handlebars +++ b/static/templates/admin_tab.handlebars @@ -9,6 +9,7 @@
+
+
+ +
+ +
+
diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 7992a7a626..0fb1ef7bbe 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -230,6 +230,18 @@ def do_set_realm_invite_required(realm, invite_required): send_event(event, active_user_ids(realm)) return {} +def do_set_realm_invite_by_admins_only(realm, invite_by_admins_only): + realm.invite_by_admins_only = invite_by_admins_only + realm.save(update_fields=['invite_by_admins_only']) + event = dict( + type="realm", + op="update", + property='invite_by_admins_only', + value=invite_by_admins_only, + ) + send_event(event, active_user_ids(realm)) + return {} + def do_deactivate_realm(realm): """ Deactivate this realm. Do NOT deactivate the users -- we need to be able to @@ -2321,6 +2333,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id): state['realm_name'] = user_profile.realm.name state['realm_restricted_to_domain'] = user_profile.realm.restricted_to_domain state['realm_invite_required'] = user_profile.realm.invite_required + state['realm_invite_by_admins_only'] = user_profile.realm.invite_by_admins_only if want('realm_domain'): state['realm_domain'] = user_profile.realm.domain diff --git a/zerver/migrations/0079_auto__add_field_realm_invite_by_admins_only.py b/zerver/migrations/0079_auto__add_field_realm_invite_by_admins_only.py new file mode 100644 index 0000000000..66dd6bdef8 --- /dev/null +++ b/zerver/migrations/0079_auto__add_field_realm_invite_by_admins_only.py @@ -0,0 +1,271 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Realm.invite_by_admins_only' + db.add_column(u'zerver_realm', 'invite_by_admins_only', + self.gf('django.db.models.fields.BooleanField')(default=False), + keep_default=True) + db.execute("UPDATE zerver_realm SET invite_by_admins_only = TRUE WHERE domain = 'users.customer4.invalid'") + + + def backwards(self, orm): + # Deleting field 'Realm.invite_by_admins_only' + db.delete_column(u'zerver_realm', 'invite_by_admins_only') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'zerver.appledevicetoken': { + 'Meta': {'object_name': 'AppleDeviceToken'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now': 'True', 'blank': 'True'}), + 'token': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.client': { + 'Meta': {'object_name': 'Client'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30', 'db_index': 'True'}) + }, + u'zerver.defaultstream': { + 'Meta': {'unique_together': "(('realm', 'stream'),)", 'object_name': 'DefaultStream'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']"}), + 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Stream']"}) + }, + u'zerver.huddle': { + 'Meta': {'object_name': 'Huddle'}, + 'huddle_hash': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + u'zerver.message': { + 'Meta': {'object_name': 'Message'}, + 'content': ('django.db.models.fields.TextField', [], {}), + 'edit_history': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'has_attachment': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'has_image': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'has_link': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_edit_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'pub_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + 'recipient': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Recipient']"}), + 'rendered_content': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'rendered_content_version': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}), + 'sending_client': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Client']"}), + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '60', 'db_index': 'True'}) + }, + u'zerver.mituser': { + 'Meta': {'object_name': 'MitUser'}, + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + }, + u'zerver.preregistrationuser': { + 'Meta': {'object_name': 'PreregistrationUser'}, + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invited_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']", 'null': 'True'}), + 'referred_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']", 'null': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'streams': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['zerver.Stream']", 'null': 'True', 'symmetrical': 'False'}) + }, + u'zerver.pushdevicetoken': { + 'Meta': {'object_name': 'PushDeviceToken'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ios_app_id': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'kind': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), + 'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now': 'True', 'blank': 'True'}), + 'token': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '4096'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.realm': { + 'Meta': {'object_name': 'Realm'}, + 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'deactivated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'domain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invite_by_admins_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'invite_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'mandatory_topics': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), + 'notifications_stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': u"orm['zerver.Stream']"}), + 'restricted_to_domain': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'show_digest_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'zerver.realmalias': { + 'Meta': {'object_name': 'RealmAlias'}, + 'domain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']", 'null': 'True'}) + }, + u'zerver.realmemoji': { + 'Meta': {'unique_together': "(('realm', 'name'),)", 'object_name': 'RealmEmoji'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'img_url': ('django.db.models.fields.TextField', [], {}), + 'name': ('django.db.models.fields.TextField', [], {}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']"}) + }, + u'zerver.realmfilter': { + 'Meta': {'unique_together': "(('realm', 'pattern'),)", 'object_name': 'RealmFilter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'pattern': ('django.db.models.fields.TextField', [], {}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']"}), + 'url_format_string': ('django.db.models.fields.TextField', [], {}) + }, + u'zerver.recipient': { + 'Meta': {'unique_together': "(('type', 'type_id'),)", 'object_name': 'Recipient'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'db_index': 'True'}), + 'type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}) + }, + u'zerver.referral': { + 'Meta': {'object_name': 'Referral'}, + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'user_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.scheduledjob': { + 'Meta': {'object_name': 'ScheduledJob'}, + 'data': ('django.db.models.fields.TextField', [], {}), + 'filter_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'filter_string': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'scheduled_timestamp': ('django.db.models.fields.DateTimeField', [], {}), + 'type': ('django.db.models.fields.PositiveSmallIntegerField', [], {}) + }, + u'zerver.stream': { + 'Meta': {'unique_together': "(('name', 'realm'),)", 'object_name': 'Stream'}, + 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'deactivated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024'}), + 'email_token': ('django.db.models.fields.CharField', [], {'default': "'47beaaed350946c6e4846643d05c64ce'", 'max_length': '32'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invite_only': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '60', 'db_index': 'True'}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']"}) + }, + u'zerver.streamcolor': { + 'Meta': {'object_name': 'StreamColor'}, + 'color': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Subscription']"}) + }, + u'zerver.subscription': { + 'Meta': {'unique_together': "(('user_profile', 'recipient'),)", 'object_name': 'Subscription'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'audible_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'color': ('django.db.models.fields.CharField', [], {'default': "'#c2c2c2'", 'max_length': '10'}), + 'desktop_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_home_view': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}), + 'notifications': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'recipient': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Recipient']"}), + 'user_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.useractivity': { + 'Meta': {'unique_together': "(('user_profile', 'client', 'query'),)", 'object_name': 'UserActivity'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Client']"}), + 'count': ('django.db.models.fields.IntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_visit': ('django.db.models.fields.DateTimeField', [], {}), + 'query': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'user_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.useractivityinterval': { + 'Meta': {'object_name': 'UserActivityInterval'}, + 'end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'start': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + 'user_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.usermessage': { + 'Meta': {'unique_together': "(('user_profile', 'message'),)", 'object_name': 'UserMessage'}, + 'flags': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Message']"}), + 'user_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.userpresence': { + 'Meta': {'unique_together': "(('user_profile', 'client'),)", 'object_name': 'UserPresence'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Client']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {}), + 'user_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']"}) + }, + u'zerver.userprofile': { + 'Meta': {'object_name': 'UserProfile'}, + 'alert_words': ('django.db.models.fields.TextField', [], {'default': "'[]'"}), + 'api_key': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'autoscroll_forever': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'avatar_source': ('django.db.models.fields.CharField', [], {'default': "'G'", 'max_length': '1'}), + 'bot_owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.UserProfile']", 'null': 'True', 'on_delete': 'models.SET_NULL'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'default_all_public_streams': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'default_desktop_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'default_events_register_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': u"orm['zerver.Stream']"}), + 'default_sending_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': u"orm['zerver.Stream']"}), + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'db_index': 'True'}), + 'enable_desktop_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enable_digest_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enable_offline_email_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enable_offline_push_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enable_sounds': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enable_stream_desktop_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enable_stream_sounds': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'enter_sends': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}), + 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invites_granted': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'invites_used': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_bot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_mirror_dummy': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_pointer_updater': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'last_reminder': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'null': 'True'}), + 'muted_topics': ('django.db.models.fields.TextField', [], {'default': "'[]'"}), + 'onboarding_steps': ('django.db.models.fields.TextField', [], {'default': "'[]'"}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'pointer': ('django.db.models.fields.IntegerField', [], {}), + 'rate_limits': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100'}), + 'realm': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['zerver.Realm']"}), + 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'tutorial_status': ('django.db.models.fields.CharField', [], {'default': "'W'", 'max_length': '1'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}) + } + } + + complete_apps = ['zerver'] diff --git a/zerver/models.py b/zerver/models.py index e84c1afe14..bfbf319d4f 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -116,6 +116,7 @@ class Realm(models.Model): name = models.CharField(max_length=40, null=True) restricted_to_domain = models.BooleanField(default=True) invite_required = models.BooleanField(default=False) + invite_by_admins_only = models.BooleanField(default=False) mandatory_topics = models.BooleanField(default=False) show_digest_email = models.BooleanField(default=True) diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index be3b4f9c6f..9d75df0c66 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -33,7 +33,7 @@ from zerver.lib.actions import bulk_remove_subscriptions, do_change_password, \ create_stream_if_needed, gather_subscriptions, subscribed_to_stream, \ update_user_presence, bulk_add_subscriptions, do_events_register, \ get_status_dict, do_change_enable_offline_email_notifications, \ - do_change_enable_digest_emails, do_set_realm_name, do_set_realm_restricted_to_domain, do_set_realm_invite_required, internal_prep_message, \ + do_change_enable_digest_emails, do_set_realm_name, do_set_realm_restricted_to_domain, do_set_realm_invite_required, do_set_realm_invite_by_admins_only, internal_prep_message, \ do_send_messages, get_default_subs, do_deactivate_user, do_reactivate_user, \ user_email_is_unique, do_invite_users, do_refer_friend, compute_mit_user_fullname, \ do_add_alert_words, do_remove_alert_words, do_set_alert_words, get_subscriber_emails, \ @@ -1049,6 +1049,7 @@ def home(request): domain = user_profile.realm.domain, realm_name = register_ret['realm_name'], realm_invite_required = register_ret['realm_invite_required'], + realm_invite_by_admins_only = register_ret['realm_invite_by_admins_only'], realm_restricted_to_domain = register_ret['realm_restricted_to_domain'], enter_sends = user_profile.enter_sends, referrals = register_ret['referrals'], @@ -1111,10 +1112,8 @@ def home(request): statsd.incr('views.home') show_invites = True - # For the CUSTOMER4 student realm, only let instructors (who have - # @customer4.invalid addresses) invite new users. - if ((user_profile.realm.domain == "users.customer4.invalid") and - (not user_profile.email.lower().endswith("@customer4.invalid"))): + # Some realms only allow admins to invite users + if user_profile.realm.invite_by_admins_only and not user_profile.is_admin(): show_invites = False # Warn users on the zulip.com realm to use staging. @@ -1339,7 +1338,8 @@ def get_public_streams_backend(request, user_profile): @has_request_variables def update_realm(request, user_profile, name=REQ(validator=check_string, default=None), restricted_to_domain=REQ(validator=check_bool, default=None), - invite_required=REQ(validator=check_bool,default=None)): + invite_required=REQ(validator=check_bool,default=None), + invite_by_admins_only=REQ(validator=check_bool,default=None)): realm = user_profile.realm data = {} if name is not None and realm.name != name: @@ -1351,6 +1351,9 @@ def update_realm(request, user_profile, name=REQ(validator=check_string, default if invite_required is not None and realm.invite_required != invite_required: do_set_realm_invite_required(realm, invite_required) data['invite_required'] = invite_required + if invite_by_admins_only is not None and realm.invite_by_admins_only != invite_by_admins_only: + do_set_realm_invite_by_admins_only(realm, invite_by_admins_only) + data['invite_by_admins_only'] = invite_by_admins_only return json_success(data) @require_realm_admin