Merge branch 'dev-server' into production

gtech-mulearn · Nov 26, 2023 · 175580a · 175580a
2 parents 40aaef9 + b07f71d
commit 175580a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/dashboard/profile/profile_view.py b/api/dashboard/profile/profile_view.py
@@ -461,7 +461,7 @@ def post(self, request):
                 general_message="No user data available"
             ).get_failure_response()
 
-        self.save_password(user)
+        self.save_password(request,user)
 
     def save_password(self, request, user_obj):
         new_password = request.data.get("password")

diff --git a/db/task.py b/db/task.py
@@ -141,7 +141,7 @@ class KarmaActivityLog(models.Model):
     id                   = models.CharField(default=uuid.uuid4, primary_key=True, max_length=36)
     karma                = models.IntegerField()
     task                 = models.ForeignKey(TaskList, on_delete=models.CASCADE, related_name="karma_activity_log_task")
-    user                 = models.ForeignKey(User, on_delete=models.CASCADE, blank =True, null  =True, related_name="karma_activity_log_user")
+    user                 = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True, related_name="karma_activity_log_user")
     task_message_id      = models.CharField(max_length=36)
     lobby_message_id     = models.CharField(max_length=36, blank=True, null=True)
     dm_message_id        = models.CharField(max_length=36, blank=True, null=True)

diff --git a/utils/types.py b/utils/types.py
@@ -112,7 +112,7 @@ def get_all_values(cls):
 
 class Lc(Enum):
     KARMA = 5
-    TASK_HASHTAG = 'Basics'
+    TASK_HASHTAG = '#lcmeetreport'
 
 
 DEFAULT_HACKATHON_FORM_FIELDS = {