Merge branch 'master' into stable

qatrackplus · Mar 6, 2023 · 4cb1d97 · 4cb1d97
2 parents 9bf09b8 + 3694658
commit 4cb1d97
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/docs/install/linux.rst b/docs/install/linux.rst
@@ -91,7 +91,7 @@ QATrack+.  To checkout the code enter the following commands:
     cd web
     git clone https://github.com/qatrackplus/qatrackplus.git
     cd qatrackplus
-    git checkout v3.1.1
+    git checkout v3.1.1.1
 
 
 Installing a Database System

diff --git a/docs/install/linux_upgrade_from_030.rst b/docs/install/linux_upgrade_from_030.rst
@@ -126,7 +126,7 @@ following commands:
     cd ~/web/qatrackplus
     git remote set-url origin https://github.com/qatrackplus/qatrackplus.git
     git fetch origin
-    git checkout v3.1.1
+    git checkout v3.1.1.1
 
 
 Setting up our Python environment (including virtualenv)

diff --git a/docs/install/win.rst b/docs/install/win.rst
@@ -106,7 +106,7 @@ We're now ready to install all the libraries QATrack+ depends on.
     .\venvs\qatrack31\Scripts\Activate.ps1
     python -m pip install --upgrade pip
     cd qatrackplus
-    git checkout v3.1.1
+    git checkout v3.1.1.1
     pip install -r requirements\win.txt
 
 

diff --git a/docs/install/win_upgrade_from_030.rst b/docs/install/win_upgrade_from_030.rst
@@ -170,7 +170,7 @@ First we must check out the code for version 3.1.1 in a PowerShell window:
     cd C:\deploy\qatrackplus
     git remote set-url origin https://github.com/qatrackplus/qatrackplus.git
     git fetch origin
-    git checkout v3.1.1
+    git checkout v3.1.1.1
 
 
 Setting up our Python environment (including virtualenv)

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+
+QATrack+ v3.1.1.1 Release Notes
+-------------------------------
+* Fixed a permission check bug for users creating service event templates
+
+
 QATrack+ v3.1.1 Release Notes
 -----------------------------
 

diff --git a/qatrack/service_log/views.py b/qatrack/service_log/views.py
@@ -1606,7 +1606,7 @@ def handle_unit_down_time(request):
 
 class CreateServiceEventTemplateAjax(JSONResponseMixin, PermissionRequiredMixin, BaseCreateView):
 
-    permission_required = 'add_serviceeventtemplate'
+    permission_required = 'service_log.add_serviceeventtemplate'
     model = sl_models.ServiceEventTemplate
     form_class = forms.ServiceEventTemplateForm
 

diff --git a/qatrack/settings.py b/qatrack/settings.py
@@ -30,7 +30,7 @@
 
 LOG_ROOT = os.path.join(PROJECT_ROOT, "..", "logs")
 
-VERSION = "3.1.1"
+VERSION = "3.1.1.1"
 BUG_REPORT_URL = "https://github.com/qatrackplus/qatrackplus/issues/new"
 FEATURE_REQUEST_URL = BUG_REPORT_URL
 

diff --git a/qatrack/units/views.py b/qatrack/units/views.py
@@ -132,7 +132,7 @@ def handle_unit_available_time_edit(request):
     return get_unit_available_time_data(request)
 
 
-@permission_required('change_unitavailabletime')
+@permission_required('units.change_unitavailabletime')
 @csrf_protect
 def delete_schedules(request):