From dfa86a32500d21849e2ee9752466e29e37310524 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 19 May 2011 11:27:39 +0100 Subject: [PATCH] Allow for unmoderated groups that anyone can join --- ...o__add_field_groupinformation_moderated.py | 87 +++++++++++++++++++ app/groups/models.py | 1 + app/groups/views.py | 9 +- 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 app/groups/migrations/0004_auto__add_field_groupinformation_moderated.py diff --git a/app/groups/migrations/0004_auto__add_field_groupinformation_moderated.py b/app/groups/migrations/0004_auto__add_field_groupinformation_moderated.py new file mode 100644 index 0000000..388d0ca --- /dev/null +++ b/app/groups/migrations/0004_auto__add_field_groupinformation_moderated.py @@ -0,0 +1,87 @@ +# encoding: utf-8 +import 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 'GroupInformation.moderated' + if db.backend_name == "sqlite3": + default = 1 + else: + default = True + db.add_column('groups_groupinformation', 'moderated', self.gf('django.db.models.fields.BooleanField')(default=default), keep_default=True) + + + def backwards(self, orm): + + # Deleting field 'GroupInformation.moderated' + db.delete_column('groups_groupinformation', 'moderated') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + '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_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + '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'}), + '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'}) + }, + 'groups.groupinformation': { + 'Meta': {'ordering': "['group']", 'object_name': 'GroupInformation'}, + 'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'group': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'moderated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['auth.Group']"}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'requestable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'type': ('django.db.models.fields.IntegerField', [], {'default': '2'}) + }, + 'groups.grouprequest': { + 'Meta': {'ordering': "['created_date']", 'object_name': 'GroupRequest'}, + 'changed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'requests'", 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'reason': ('django.db.models.fields.TextField', [], {}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'grouprequests'", 'to': "orm['auth.User']"}) + } + } + + complete_apps = ['groups'] diff --git a/app/groups/models.py b/app/groups/models.py index c8d4cfc..f66a339 100644 --- a/app/groups/models.py +++ b/app/groups/models.py @@ -13,6 +13,7 @@ class GroupInformation(models.Model): admins = models.ManyToManyField(User, blank=True) public = models.BooleanField("Public", default=False, help_text="Indicates if the group is visible to all") requestable = models.BooleanField("Requestable", default=False, help_text="Indicates if people can request to join this group") + moderated = models.BooleanField("Moderated", default=True, help_text="Indicates if the group requires new members to be accepted by a group admin") parent = models.ForeignKey(Group, related_name="children", null=True, blank=True) description = models.TextField(help_text="Description of the group and its permissions", blank=True) diff --git a/app/groups/views.py b/app/groups/views.py index 2907cb7..1f11417 100644 --- a/app/groups/views.py +++ b/app/groups/views.py @@ -61,13 +61,20 @@ def create_request(request, groupid): group = get_object_or_404(Group, id=groupid) - if not group.groupinformation.requestable and not request.user in group.user_set.all(): + if request.user in group.user_set.all() or not group.groupinformation.requestable: return HttpResponseRedirect(reverse('groups.views.group_list')) if group.requests.filter(status=REQUEST_PENDING,user=request.user).count(): messages.add_message(request, messages.INFO, "You already have a pending request for %s" % group.name) return HttpResponseRedirect(reverse('groups.views.group_list')) + if not group.groupinformation.moderated: + # Unmoderated group, so accept the application + request.user.groups.add(group) + update_user_access.delay(request.user.id) + messages.add_message(request, messages.INFO, "You are now a member of %s" % (group)) + return HttpResponseRedirect(reverse('groups.views.group_list')) + if request.method == 'POST': form = GroupRequestForm(request.POST) if form.is_valid():