Merge branch 'release/1.1.3'

KUWAITNET · Jul 21, 2023 · 4ea9aef · 4ea9aef
2 parents 4be5ce5 + fb8e2a5
commit 4ea9aef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,7 +1,11 @@
 Change Log
 ==========
 
-2023.02.15 (v1.1.2)
+2023.07.21 (v1.1.3)
+~~~~~~~~~~~~~~~~~~~
+* Fix command running twice if using django rq is set
+
+2023.07.18 (v1.1.2)
 ~~~~~~~~~~~~~~~~~~~
 * Add Django 4.1+ support
 

diff --git a/admin_commands/__init__.py b/admin_commands/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.2'
+__version__ = '1.1.3'
diff --git a/admin_commands/admin.py b/admin_commands/admin.py
@@ -67,8 +67,9 @@ def execute_command_and_return_response(self, request, command, args):
             from django_rq import get_queue
             queue = get_queue('default')
             queue.enqueue(command.execute, request.user, args)
+        else:
+            command.execute(request.user, args)
 
-        command.execute(request.user, args)
         self.message_user(request, _('Command executed'))
         return self.response_post_save_add(request, command)