fix edit password - organization fix childs
This commit is contained in:
2
.idea/Rasaddam_Backend.iml
generated
2
.idea/Rasaddam_Backend.iml
generated
@@ -14,7 +14,7 @@
|
||||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.10 (bazrasienv)" jdkType="Python SDK" />
|
||||
<orderEntry type="jdk" jdkName="Python 3.10 (env)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="PyDocumentationSettings">
|
||||
|
||||
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (bazrasienv)" project-jdk-type="Python SDK" />
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (env)" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
@@ -133,7 +133,8 @@ class UserSerializer(serializers.ModelSerializer):
|
||||
def update(self, instance, validated_data):
|
||||
""" update user instance """
|
||||
instance.username = validated_data.get('username', instance.username)
|
||||
instance.password = validated_data.get('password', instance.password)
|
||||
if not validated_data.get('password'):
|
||||
instance.password = validated_data.get('password', instance.password)
|
||||
instance.first_name = validated_data.get('first_name')
|
||||
instance.last_name = validated_data.get('last_name')
|
||||
instance.is_active = validated_data.get('is_active')
|
||||
|
||||
@@ -55,7 +55,10 @@ class QuotaViewSet(viewsets.ModelViewSet, DynamicSearchMixin): # noqa
|
||||
user_relation = request.user.user_relation.all().first()
|
||||
|
||||
# add user relation to data
|
||||
request.data['registerer_organization'] = user_relation.organization.id
|
||||
if user_relation.organization:
|
||||
request.data['registerer_organization'] = user_relation.organization.id
|
||||
else:
|
||||
raise APIException("برای این کاربر سازمانی تعریف نشده است") # noqa
|
||||
|
||||
# create quota
|
||||
serializer = self.serializer_class(data=request.data)
|
||||
|
||||
Reference in New Issue
Block a user