MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix edit password - organization fix childs

Browse Source
This commit is contained in:
Mojtaba-z
2025-08-07 09:45:02 +03:30
parent 6477a35200
commit 482ae540fd
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/Rasaddam_Backend.iml generated
View File

@@ -14,7 +14,7 @@
</component> </component>
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <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" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="PyDocumentationSettings"> <component name="PyDocumentationSettings">

2
.idea/misc.xml generated
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <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> </project>

3
apps/authentication/api/v1/serializers/serializer.py
View File

@@ -133,7 +133,8 @@ class UserSerializer(serializers.ModelSerializer):
def update(self, instance, validated_data): def update(self, instance, validated_data):
""" update user instance """ """ update user instance """
instance.username = validated_data.get('username', instance.username) 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.first_name = validated_data.get('first_name')
instance.last_name = validated_data.get('last_name') instance.last_name = validated_data.get('last_name')
instance.is_active = validated_data.get('is_active') instance.is_active = validated_data.get('is_active')

5
apps/product/web/api/v1/viewsets/quota_api.py
View File

@@ -55,7 +55,10 @@ class QuotaViewSet(viewsets.ModelViewSet, DynamicSearchMixin): # noqa
user_relation = request.user.user_relation.all().first() user_relation = request.user.user_relation.all().first()
# add user relation to data # 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 # create quota
serializer = self.serializer_class(data=request.data) serializer = self.serializer_class(data=request.data)