From 5297446039388ddc518c2646585d732be3a93a6e Mon Sep 17 00:00:00 2001 From: Somgester Date: Wed, 23 Oct 2024 03:24:07 +0530 Subject: [PATCH 1/2] minor changes --- .../migrations/0003_merge_20241023_0006.py | 14 ++++++++++++++ FusionIIIT/applications/iwdModuleV2/api/views.py | 9 ++++----- .../migrations/0003_merge_20241023_0006.py | 14 ++++++++++++++ .../migrations/0003_merge_20241023_0006.py | 14 ++++++++++++++ 4 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py create mode 100644 FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py create mode 100644 FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py diff --git a/FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py b/FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py new file mode 100644 index 000000000..fb35ac37e --- /dev/null +++ b/FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py @@ -0,0 +1,14 @@ +# Generated by Django 3.1.5 on 2024-10-23 00:06 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('central_mess', '0002_auto_20241010_1836'), + ('central_mess', '0002_auto_20241015_1451'), + ] + + operations = [ + ] diff --git a/FusionIIIT/applications/iwdModuleV2/api/views.py b/FusionIIIT/applications/iwdModuleV2/api/views.py index 4d12d800a..ca631795b 100644 --- a/FusionIIIT/applications/iwdModuleV2/api/views.py +++ b/FusionIIIT/applications/iwdModuleV2/api/views.py @@ -571,8 +571,8 @@ def handle_dean_process_requests(request): @permission_classes([IsAuthenticated]) def dean_processed_requests(request): obj = [] - desg = request.session.get('currentDesignationSelected') - + params = request.query_params + desg = params.get('role') inbox_files = view_inbox( username=request.user.username, designation=desg, @@ -631,7 +631,7 @@ def handle_director_approval_requests(request): @permission_classes([IsAuthenticated]) def rejectedRequests(request): obj = [] - desg = request.session.get('currentDesignationSelected') + desg = request.query_params.get('role') # Fetch inbox files for the current user and designation inbox_files = view_inbox( @@ -682,8 +682,7 @@ def rejectedRequests(request): @permission_classes([IsAuthenticated]) def updateRejectedRequests(request): request_id = request.data.get("id", 0) - - desg = request.session.get('currentDesignationSelected') + desg = request.data.get("role", "") # Fetch the inbox files for the current user and designation inbox_files = view_inbox( diff --git a/FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py b/FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py new file mode 100644 index 000000000..560d65b45 --- /dev/null +++ b/FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py @@ -0,0 +1,14 @@ +# Generated by Django 3.1.5 on 2024-10-23 00:06 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('online_cms', '0002_auto_20241010_1836'), + ('online_cms', '0002_auto_20241015_1451'), + ] + + operations = [ + ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py b/FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py new file mode 100644 index 000000000..00633c298 --- /dev/null +++ b/FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py @@ -0,0 +1,14 @@ +# Generated by Django 3.1.5 on 2024-10-23 00:06 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('research_procedures', '0002_auto_20241010_1836'), + ('research_procedures', '0002_auto_20241015_1451'), + ] + + operations = [ + ] From 766d60359d93e297d1340cfe61b370a67e6faf75 Mon Sep 17 00:00:00 2001 From: Somgester Date: Wed, 23 Oct 2024 03:26:08 +0530 Subject: [PATCH 2/2] minor changes --- .../migrations/0003_merge_20241023_0006.py | 14 -------------- .../migrations/0003_merge_20241023_0006.py | 14 -------------- .../migrations/0003_merge_20241023_0006.py | 14 -------------- 3 files changed, 42 deletions(-) delete mode 100644 FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py delete mode 100644 FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py diff --git a/FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py b/FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py deleted file mode 100644 index fb35ac37e..000000000 --- a/FusionIIIT/applications/central_mess/migrations/0003_merge_20241023_0006.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.5 on 2024-10-23 00:06 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('central_mess', '0002_auto_20241010_1836'), - ('central_mess', '0002_auto_20241015_1451'), - ] - - operations = [ - ] diff --git a/FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py b/FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py deleted file mode 100644 index 560d65b45..000000000 --- a/FusionIIIT/applications/online_cms/migrations/0003_merge_20241023_0006.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.5 on 2024-10-23 00:06 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('online_cms', '0002_auto_20241010_1836'), - ('online_cms', '0002_auto_20241015_1451'), - ] - - operations = [ - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py b/FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py deleted file mode 100644 index 00633c298..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0003_merge_20241023_0006.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.5 on 2024-10-23 00:06 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0002_auto_20241010_1836'), - ('research_procedures', '0002_auto_20241015_1451'), - ] - - operations = [ - ]