From bcc472118944aa421ca51c0c4c815977d756eb95 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 27 Feb 2023 13:05:24 -0600
Subject: [PATCH] docs(management): update guide to avoid bug

---
 .../management/commands/group_perms/README.md | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/taccsite_cms/management/commands/group_perms/README.md b/taccsite_cms/management/commands/group_perms/README.md
index 76d52c165..3ab2593fd 100644
--- a/taccsite_cms/management/commands/group_perms/README.md
+++ b/taccsite_cms/management/commands/group_perms/README.md
@@ -12,16 +12,26 @@ You may **either** download an appropriate `.html` from [Django CMS - Developer
 
 Use regex to convert the `<option>`s from HTML to Python Django CMS instructions.
 
-- Find:
+- Find:\
+  <sub>(minified HTML)</sub>
 
   ```regexp
-  [\n\s]*<option[\n\s]*value=".+"[\n\s]*title="[\s\w]+ \| [\s\w]+ \| ([\s\w]+)"[\n\s]*>\n[\s]*[\s\w]+ \| [\s\w]+ \| [\s\w]+</option>
+  <option value=".+?" title="([\s\w]+) \| ([\s\w]+) \| ([\s\w]+)">[\s\w]+ \| [\s\w]+ \| [\s\w]+</option>
+  ```
+
+  <sub>(unminified HTML)</sub>
+
+  ```regexp
+  [\n\s]*<option[\n\s]*value=".+"[\n\s]*title="([\s\w]+) \| ([\s\w]+) \| ([\s\w]+)"[\n\s]*>\n*[\s]*[\s\w]+ \| [\s\w]+ \| [\s\w]+</option>
   ```
 
 - Replace:
 
   ```text
-  group.permissions.add( Permission.objects.get(name='$1') )\n
+
+    model_name = '$2'.lower().replace(' ', '')
+    content_type = ContentType.objects.get(app_label='$1', model=model_name)
+    group.permissions.add( Permission.objects.get(name='$3', content_type=content_type) )
   ```
 
 ## Program Permissions
@@ -29,9 +39,10 @@ Use regex to convert the `<option>`s from HTML to Python Django CMS instructions
 1. Create a python script in this directory named after the group e.g. `news_writer_advanced.py`.
 2. Add this starter code:
 
-   ```py
-   from django.contrib.auth.models import Group, Permission
-   from django.core.management import BaseCommand
+  ```py
+  from django.contrib.auth.models import Group, Permission
+  from django.contrib.contenttypes.models import ContentType
+  from django.core.management import BaseCommand
 
    def set_group_perms():
        group, was_created = Group.objects.get_or_create(
@@ -53,12 +64,15 @@ Use regex to convert the `<option>`s from HTML to Python Django CMS instructions
 
 1. Open a shell into the CMS container e.g. `docker exec -it core_cms /bin/bash`.
 2. In the shell, open a Python shell i.e. `python`.
-3. In the Python shell, run these commands:
-   1. `import os`
-   2. `import django`
-   3. `os.environ.setdefault("DJANGO_SETTINGS_MODULE", "taccsite_cms.settings")`
-   4. `django.setup()`
-   5. Any additional debugging code or scripts you want to execute.
+3. In the Python shell, run the following commands.
+
+```py
+import os
+import django
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "taccsite_cms.settings")
+django.setup()
+# any additional debugging code or scripts you want to execute
+```
 
 ## Reference