forked from openedx/edx-platform
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #697 from edx-solutions/msaqib52/YONK-302
YONK-302: Adds API endpoint to link Organization permission groups with users
- Loading branch information
Showing
6 changed files
with
416 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...migrations/0004_auto__add_organizationgroupuser__add_unique_organizationgroupuser_orga.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # pylint: disable=C0103, C0111 | ||
| from south.utils import datetime_utils as datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models # pylint: disable=W0611 | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): # pylint: disable=C0111 | ||
|
|
||
| def forwards(self, orm): # pylint: disable=C0111 | ||
| # Adding model 'OrganizationGroupUser' | ||
| db.create_table('organizations_organizationgroupuser', ( | ||
| ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
| ('created', self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now)), | ||
| ('modified', self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now)), | ||
| ('organization', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['organizations.Organization'])), # pylint: disable=C0301 | ||
| ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.Group'])), | ||
| ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), | ||
| )) | ||
| db.send_create_signal('organizations', ['OrganizationGroupUser']) | ||
|
|
||
| # Adding unique constraint on 'OrganizationGroupUser', fields ['organization', 'group', 'user'] | ||
| db.create_unique('organizations_organizationgroupuser', ['organization_id', 'group_id', 'user_id']) | ||
|
|
||
|
|
||
| def backwards(self, orm): # pylint: disable=C0111, W0613 | ||
| # Removing unique constraint on 'OrganizationGroupUser', fields ['organization', 'group', 'user'] | ||
| db.delete_unique('organizations_organizationgroupuser', ['organization_id', 'group_id', 'user_id']) | ||
|
|
||
| # Deleting model 'OrganizationGroupUser' | ||
| db.delete_table('organizations_organizationgroupuser') | ||
|
|
||
|
|
||
| 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'}) # pylint: disable=C0301 | ||
| }, | ||
| 'auth.permission': { | ||
| 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, # pylint: disable=C0301 | ||
| 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), # pylint: disable=C0301 | ||
| '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'}), # pylint: disable=C0301 | ||
| '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'}), # pylint: disable=C0301 | ||
| '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'"}, # pylint: disable=C0301 | ||
| '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'}) | ||
| }, | ||
| 'organizations.organization': { | ||
| 'Meta': {'object_name': 'Organization'}, | ||
| 'contact_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), # pylint: disable=C0301 | ||
| 'contact_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), # pylint: disable=C0301 | ||
| 'contact_phone': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), # pylint: disable=C0301 | ||
| 'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), # pylint: disable=C0301 | ||
| 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'organizations'", 'symmetrical': 'False', 'to': "orm['auth.Group']"}), # pylint: disable=C0301 | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'logo_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), # pylint: disable=C0301 | ||
| 'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'organizations'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), # pylint: disable=C0301 | ||
| 'workgroups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'organizations'", 'symmetrical': 'False', 'to': "orm['projects.Workgroup']"}) # pylint: disable=C0301 | ||
| }, | ||
| 'organizations.organizationgroupuser': { | ||
| 'Meta': {'unique_together': "(('organization', 'group', 'user'),)", 'object_name': 'OrganizationGroupUser'}, | ||
| 'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['organizations.Organization']"}), # pylint: disable=C0301 | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) | ||
| }, | ||
| 'projects.project': { | ||
| 'Meta': {'unique_together': "(('course_id', 'content_id', 'organization'),)", 'object_name': 'Project'}, | ||
| 'content_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'projects'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['organizations.Organization']"}) # pylint: disable=C0301 | ||
| }, | ||
| 'projects.workgroup': { | ||
| 'Meta': {'object_name': 'Workgroup'}, | ||
| 'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'workgroups'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.Group']"}), # pylint: disable=C0301 | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'workgroups'", 'to': "orm['projects.Project']"}), # pylint: disable=C0301 | ||
| 'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'workgroups'", 'to': "orm['auth.User']", 'through': "orm['projects.WorkgroupUser']", 'blank': 'True', 'symmetrical': 'False', 'null': 'True'}) # pylint: disable=C0301 | ||
| }, | ||
| 'projects.workgroupuser': { | ||
| 'Meta': {'object_name': 'WorkgroupUser', 'db_table': "'projects_workgroup_users'"}, | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), | ||
| 'workgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Workgroup']"}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['organizations'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| """ Organizations API URI specification """ | ||
| from django.conf.urls import patterns, url | ||
|
|
||
| from organizations import views as organizations_views | ||
|
|
||
|
|
||
| urlpatterns = patterns( | ||
| '', | ||
| url(r'^(?P<organization_id>[0-9]+)/groups/(?P<group_id>[0-9]+)/users$', | ||
| organizations_views.OrganizationsGroupsUsersList.as_view()), | ||
| ) |
Oops, something went wrong.