.gitignore

@@ -5,7 +5,6 @@ instance/
 /*.kdev4
 .git/
 ownchatbot/snippets/
-ownchatbot/static/Shunda.ttf
 
 __pycache__/
 *.py[cod]

TODO.md

@@ -1,3 +1,2 @@
-* Make New categories page return to categories tab
 * Add a general chat celebration
 * Short video tutorials on configuring OwnchatBot

ownchatbot/templates/add.html

@@ -146,7 +146,11 @@
             {% endif %}
             <br><button class="button button2" type="submit">Create {{ reward_type }}</button><br>
         </form>
-        <a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
+	{% if reward_type == "category"%}
+        	<a href="{{ url_for('web_panels.mgmt', activeTab='categories') }}">Cancel</a>
+        {% else %}
+            <a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
+        {% endif %}
         <br><br>
     </div>
 </body>

ownchatbot/templates/edit.html

@@ -125,11 +125,10 @@
                 <br><button class="button button2" type="submit">Save Changes</button><br>
             </form>
 		{% if reward_data["type"] == "category"%}
-			actab = 'categories'
+			<a href="{{ url_for('web_panels.mgmt', activeTab='categories') }}">Cancel</a>
 		{% else %}
-			actab = 'managerewards'
+			<a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
 		{% endif %}
-		<a href="{{ url_for('web_panels.mgmt', activeTab=actab) }}">Cancel</a>
             <br><br>
         </body>
     </div>

ownchatbot/web_panels.py

@@ -305,7 +305,10 @@ def edit(reward_name):
             reread_goals()
         if reward_data['type'] == 'vote':
             reread_votes()
-        return redirect(url_for('web_panels.mgmt', activeTab='managerewards'))
+        if reward_data['type'] == 'category':
+            return redirect(url_for('web_panels.mgmt', activeTab='categories'))
+        else:
+            return redirect(url_for('web_panels.mgmt', activeTab='managerewards'))
 
     return render_template('edit.html',
                            all_cats=all_cats,
@@ -462,6 +465,7 @@ def add(reward_type):
             inactive_categories = current_app.config['INACTIVE_CAT']
             inactive_categories.append(name)  # Add it to the INACTIVE_CAT variable
             reread_categories()  # Write it to categories.py
+            return redirect(url_for('web_panels.mgmt', activeTab='categories'))
         return redirect(url_for('web_panels.mgmt', activeTab='managerewards'))
 
     return render_template('add.html',
@@ -543,7 +547,7 @@ def rereadv():
 @requires_login
 def clearfulfilled():
     if clear_fulfilled_rewards():
-            current_app.logger.info('Cleared fulfilled rewards.')
+        current_app.logger.info('Cleared fulfilled rewards.')
     return redirect(url_for('web_panels.mgmtqueue'))
 
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ownchatbot"
-version = "1.1.dev2"
+version = "1.1.2"
 authors = [
     {name = "DeadTOm", email = "deadtom@deadtom.me"},
 ]

setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ownchatbot',
-    version='1.1.dev2',
+    version='1.1.2',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[