Merge branch 'development' into 57-email-link-to-settings-is-hardcoded

CHANGELOG.md

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Modules and assignments were not sorted (@dsavvidi)
+- Fixed bug where changing the staff role did not work (@dsavvidi)
 - Email link to settings was hardcoded (@dsavvidi)
 
 ## [2.1.0]

src/main/resources/templates/layout.html

@@ -31,7 +31,7 @@
         <script src="/webjars/sockjs-client/sockjs.min.js"></script>
         <script src="/webjars/stomp-websocket/stomp.min.js"></script>
         <script type="module" src="/webjars/chihuahui/components.js"></script>
-        <script src="/webjars/chihuahui/selectbox.js"></script>
+        <script type="module" src="/webjars/chihuahui/selectbox.js"></script>
         <script src="/webjars/chihuahui/theme.js"></script>
         <script th:src="@{/js/notifications.js}"></script>
         <script th:src="@{/js/announcements.js}"></script>

src/main/resources/templates/person/change_role.html

@@ -42,7 +42,7 @@
                         type="button"
                         class="button p-less"
                         th:text="#{person.change_role}"
-                        th:onclick="|submitForm('change-role-${role.person.id}')|"></button>
+                        th:onclick="|document.getElementById('change-role-${role.person.id}').submit();|"></button>
                 </div>
             </div>
         </dialog>