Browse Source

fixing typo in role_mapping

pull/333/head
margaretmeehan 6 years ago
parent
commit
d602fc75e6
5 changed files with 14 additions and 9 deletions
  1. 6
      app/api/migrations/0004_roles.py
  2. 7
      app/api/models.py
  3. 2
      app/api/views.py
  4. 6
      app/server/static/package-lock.json
  5. 2
      app/server/static/package.json

6
app/api/migrations/0004_roles.py

@ -29,9 +29,11 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='role_mapping', to='api.Project')),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
related_name='role_mappings', to='api.Project')),
('role', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.Role')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='role_mapping', to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
related_name='role_mappings', to=settings.AUTH_USER_MODEL)),
],
),
migrations.AlterUniqueTogether(

7
app/api/models.py

@ -247,10 +247,13 @@ class Role(models.Model):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.name
class RoleMapping(models.Model):
user = models.ForeignKey(User, related_name='role_mapping', on_delete=models.CASCADE)
project = models.ForeignKey(Project, related_name='role_mapping', on_delete=models.CASCADE)
user = models.ForeignKey(User, related_name='role_mappings', on_delete=models.CASCADE)
project = models.ForeignKey(Project, related_name='role_mappings', on_delete=models.CASCADE)
role = models.ForeignKey(Role, on_delete=models.CASCADE)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)

2
app/api/views.py

@ -346,7 +346,7 @@ class RoleMappingList(generics.ListCreateAPIView):
def get_queryset(self):
project = get_object_or_404(Project, pk=self.kwargs['project_id'])
return project.role_mapping
return project.role_mappings
def perform_create(self, serializer):
project = get_object_or_404(Project, pk=self.kwargs['project_id'])

6
app/server/static/package-lock.json

@ -1059,9 +1059,9 @@
}
},
"buefy": {
"version": "0.7.10",
"resolved": "https://registry.npmjs.org/buefy/-/buefy-0.7.10.tgz",
"integrity": "sha512-jU9CTEQR1rozxagwEPB69qObBDwW4uCa6TjiPkqcqOb/uxq1uvyvCsVinADzjNjzOTFhUOuuSPQk8gsVEOzA==",
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/buefy/-/buefy-0.8.2.tgz",
"integrity": "sha512-fS4sXYE0ge7fN5tP9k67j1fSCS/yxbTrnEhJ5MBt89gcbmVe5x8/SAXdADjx5W4SdERtjKjE9mzoIoRb+ZC29Q==",
"requires": {
"bulma": "0.7.5"
}

2
app/server/static/package.json

@ -16,7 +16,7 @@
"dependencies": {
"axios": "^0.19.0",
"axios-mock-adapter": "^1.17.0",
"buefy": "^0.7.10",
"buefy": "^0.8.2",
"chart.js": "^2.7.2",
"highlight.js": "^9.12.0",
"lodash.isempty": "^4.4.0",

Loading…
Cancel
Save