Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix panic #314

Merged
merged 5 commits into from
Jan 3, 2025
Merged

fix panic #314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eaeb1d
fix panic
githubadministratoruk Jan 2, 2025
ae5da61
update
githubadministratoruk Jan 2, 2025
f725a50
runtime panic?
githubadministratoruk Jan 3, 2025
04be6bb
0.7.6-rc.1
githubadministratoruk Jan 3, 2025
8f7e51e
prevent panic
githubadministratoruk Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions templates/notification.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<p class="control">
<span class="select is-small">
<select name="role" required autocomplete="off">
<option selected>{{ "pending"|l10n(page_data.lang) }}</option>
<option>{{ "rejected"|l10n(page_data.lang) }}</option>
<option>{{ "limited"|l10n(page_data.lang) }}</option>
<option>{{ "intern"|l10n(page_data.lang) }}</option>
<option>{{ "fellow"|l10n(page_data.lang) }}</option>
<option>{{ "mod"|l10n(page_data.lang) }}</option>
<option>{{ "super"|l10n(page_data.lang) }}</option>
<option selected value="Pending">{{ "pending"|l10n(page_data.lang) }}</option>
<option value="Rejected">{{ "rejected"|l10n(page_data.lang) }}</option>
<option value="Limited">{{ "limited"|l10n(page_data.lang) }}</option>
<option value="Intern">{{ "intern"|l10n(page_data.lang) }}</option>
<option value="Fellow">{{ "fellow"|l10n(page_data.lang) }}</option>
<option value="Mod">{{ "mod"|l10n(page_data.lang) }}</option>
<option value="Super">{{ "super"|l10n(page_data.lang) }}</option>
Comment on lines +32 to +38
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Critical: Value type mismatch may cause panics

The changes introduce string values ("Pending", "Rejected", etc.) for roles, but the codebase appears to use numeric values (1=pending, 2=rejected, etc.) as seen in user_list.html. This type mismatch could be causing the panics.

Modify the values to match the numeric system:

-                                    <option selected value="Pending">{{ "pending"|l10n(page_data.lang) }}</option>
-                                    <option value="Rejected">{{ "rejected"|l10n(page_data.lang) }}</option>
-                                    <option value="Limited">{{ "limited"|l10n(page_data.lang) }}</option>
-                                    <option value="Intern">{{ "intern"|l10n(page_data.lang) }}</option>
-                                    <option value="Fellow">{{ "fellow"|l10n(page_data.lang) }}</option>
-                                    <option value="Mod">{{ "mod"|l10n(page_data.lang) }}</option>
-                                    <option value="Super">{{ "super"|l10n(page_data.lang) }}</option>
+                                    <option selected value="1">{{ "pending"|l10n(page_data.lang) }}</option>
+                                    <option value="2">{{ "rejected"|l10n(page_data.lang) }}</option>
+                                    <option value="3">{{ "limited"|l10n(page_data.lang) }}</option>
+                                    <option value="4">{{ "intern"|l10n(page_data.lang) }}</option>
+                                    <option value="5">{{ "fellow"|l10n(page_data.lang) }}</option>
+                                    <option value="7">{{ "mod"|l10n(page_data.lang) }}</option>
+                                    <option value="10">{{ "super"|l10n(page_data.lang) }}</option>
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<option selected value="Pending">{{ "pending"|l10n(page_data.lang) }}</option>
<option value="Rejected">{{ "rejected"|l10n(page_data.lang) }}</option>
<option value="Limited">{{ "limited"|l10n(page_data.lang) }}</option>
<option value="Intern">{{ "intern"|l10n(page_data.lang) }}</option>
<option value="Fellow">{{ "fellow"|l10n(page_data.lang) }}</option>
<option value="Mod">{{ "mod"|l10n(page_data.lang) }}</option>
<option value="Super">{{ "super"|l10n(page_data.lang) }}</option>
<option selected value="1">{{ "pending"|l10n(page_data.lang) }}</option>
<option value="2">{{ "rejected"|l10n(page_data.lang) }}</option>
<option value="3">{{ "limited"|l10n(page_data.lang) }}</option>
<option value="4">{{ "intern"|l10n(page_data.lang) }}</option>
<option value="5">{{ "fellow"|l10n(page_data.lang) }}</option>
<option value="7">{{ "mod"|l10n(page_data.lang) }}</option>
<option value="10">{{ "super"|l10n(page_data.lang) }}</option>

</select>
</span>
</p>
Expand Down
22 changes: 11 additions & 11 deletions templates/user_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@
<span class="select is-small">
<select name="role" required autocomplete="off">
{% if info.2 %}
<option {% if user.role == 1 %} selected {% endif %}>{{ "pending"|l10n(page_data.lang) }}</option>
<option {% if user.role == 2 %} selected {% endif %}>{{ "rejected"|l10n(page_data.lang) }}</option>
<option value="Pending" {% if user.role == 1 %} selected {% endif %}>{{ "pending"|l10n(page_data.lang) }}</option>
<option value="Rejected" {% if user.role == 2 %} selected {% endif %}>{{ "rejected"|l10n(page_data.lang) }}</option>
{% endif %}
<option {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
<option {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
<option {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
<option {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
<option {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>
<option value="Limited" {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
<option value="Intern" {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
<option value="Fellow" {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
<option value="Mod" {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
<option value="Super" {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>
Comment on lines +112 to +119
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Critical: Inn role values must be numeric to match backend expectations

The template compares roles using numeric values (e.g., {% if user.role == 1 %}), but the select options use string values. This mismatch could cause panics when processing form submissions.

Update the values to use numbers:

-                                    <option value="Pending" {% if user.role == 1 %} selected {% endif %}>{{ "pending"|l10n(page_data.lang) }}</option>
-                                    <option value="Rejected" {% if user.role == 2 %} selected {% endif %}>{{ "rejected"|l10n(page_data.lang) }}</option>
-                                    <option value="Limited" {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
-                                    <option value="Intern" {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
-                                    <option value="Fellow" {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
-                                    <option value="Mod" {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
-                                    <option value="Super" {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>
+                                    <option value="1" {% if user.role == 1 %} selected {% endif %}>{{ "pending"|l10n(page_data.lang) }}</option>
+                                    <option value="2" {% if user.role == 2 %} selected {% endif %}>{{ "rejected"|l10n(page_data.lang) }}</option>
+                                    <option value="3" {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
+                                    <option value="4" {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
+                                    <option value="5" {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
+                                    <option value="7" {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
+                                    <option value="10" {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<option value="Pending" {% if user.role == 1 %} selected {% endif %}>{{ "pending"|l10n(page_data.lang) }}</option>
<option value="Rejected" {% if user.role == 2 %} selected {% endif %}>{{ "rejected"|l10n(page_data.lang) }}</option>
{% endif %}
<option {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
<option {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
<option {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
<option {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
<option {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>
<option value="Limited" {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
<option value="Intern" {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
<option value="Fellow" {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
<option value="Mod" {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
<option value="Super" {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>
<option value="1" {% if user.role == 1 %} selected {% endif %}>{{ "pending"|l10n(page_data.lang) }}</option>
<option value="2" {% if user.role == 2 %} selected {% endif %}>{{ "rejected"|l10n(page_data.lang) }}</option>
{% endif %}
<option value="3" {% if user.role == 3 %} selected {% endif %}>{{ "limited"|l10n(page_data.lang) }}</option>
<option value="4" {% if user.role == 4 %} selected {% endif %}>{{ "intern"|l10n(page_data.lang) }}</option>
<option value="5" {% if user.role == 5 %} selected {% endif %}>{{ "fellow"|l10n(page_data.lang) }}</option>
<option value="7" {% if user.role == 7 %} selected {% endif %}>{{ "mod"|l10n(page_data.lang) }}</option>
<option value="10" {% if user.role == 10 %} selected {% endif %}>{{ "super"|l10n(page_data.lang) }}</option>

</select>
</span>
</p>
Expand All @@ -133,10 +133,10 @@
<p class="control">
<span class="select is-small">
<select name="role" required autocomplete="off">
<option {% if user.role == 255 %} selected {% endif %}>{{ "admin"|l10n(page_data.lang) }}</option>
<option {% if user.role == 100 %} selected {% endif %}>{{ "senior"|l10n(page_data.lang) }}</option>
<option {% if user.role == 10 %} selected {% endif %}>{{ "standard"|l10n(page_data.lang) }}</option>
<option {% if user.role == 0 %} selected {% endif %}>{{ "banned"|l10n(page_data.lang) }}</option>
<option value="Admin" {% if user.role == 255 %} selected {% endif %}>{{ "admin"|l10n(page_data.lang) }}</option>
<option value="Senior" {% if user.role == 100 %} selected {% endif %}>{{ "senior"|l10n(page_data.lang) }}</option>
<option value="Standard" {% if user.role == 10 %} selected {% endif %}>{{ "standard"|l10n(page_data.lang) }}</option>
<option value="Banned" {% if user.role == 0 %} selected {% endif %}>{{ "banned"|l10n(page_data.lang) }}</option>
Comment on lines +136 to +139
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Critical: Global role values must be numeric to match backend expectations

Similar to the Inn roles, the global role values should be numeric to match the backend's expectations.

Update the values to use numbers:

-                                    <option value="Admin" {% if user.role == 255 %} selected {% endif %}>{{ "admin"|l10n(page_data.lang) }}</option>
-                                    <option value="Senior" {% if user.role == 100 %} selected {% endif %}>{{ "senior"|l10n(page_data.lang) }}</option>
-                                    <option value="Standard" {% if user.role == 10 %} selected {% endif %}>{{ "standard"|l10n(page_data.lang) }}</option>
-                                    <option value="Banned" {% if user.role == 0 %} selected {% endif %}>{{ "banned"|l10n(page_data.lang) }}</option>
+                                    <option value="255" {% if user.role == 255 %} selected {% endif %}>{{ "admin"|l10n(page_data.lang) }}</option>
+                                    <option value="100" {% if user.role == 100 %} selected {% endif %}>{{ "senior"|l10n(page_data.lang) }}</option>
+                                    <option value="10" {% if user.role == 10 %} selected {% endif %}>{{ "standard"|l10n(page_data.lang) }}</option>
+                                    <option value="0" {% if user.role == 0 %} selected {% endif %}>{{ "banned"|l10n(page_data.lang) }}</option>
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<option value="Admin" {% if user.role == 255 %} selected {% endif %}>{{ "admin"|l10n(page_data.lang) }}</option>
<option value="Senior" {% if user.role == 100 %} selected {% endif %}>{{ "senior"|l10n(page_data.lang) }}</option>
<option value="Standard" {% if user.role == 10 %} selected {% endif %}>{{ "standard"|l10n(page_data.lang) }}</option>
<option value="Banned" {% if user.role == 0 %} selected {% endif %}>{{ "banned"|l10n(page_data.lang) }}</option>
<option value="255" {% if user.role == 255 %} selected {% endif %}>{{ "admin"|l10n(page_data.lang) }}</option>
<option value="100" {% if user.role == 100 %} selected {% endif %}>{{ "senior"|l10n(page_data.lang) }}</option>
<option value="10" {% if user.role == 10 %} selected {% endif %}>{{ "standard"|l10n(page_data.lang) }}</option>
<option value="0" {% if user.role == 0 %} selected {% endif %}>{{ "banned"|l10n(page_data.lang) }}</option>

</select>
</span>
</p>
Expand Down
Loading