Skip to content

Commit

Permalink
Fix Per Item Loot Manager (#66)
Browse files Browse the repository at this point in the history
* ignore null case and return 0 for characters that haven't received items

* bump version and update changelog
  • Loading branch information
freyamade authored Jan 10, 2024
1 parent 6164b64 commit 3a4b0cb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 21 deletions.
2 changes: 1 addition & 1 deletion backend/backend/settings_live.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def sampler(context):
# If you wish to associate users to errors (assuming you are using
# django.contrib.auth) you may enable sending PII data.
send_default_pii=True,
release='savageaim@20231227',
release='savageaim@20240109',
)

# Channels
Expand Down
2 changes: 1 addition & 1 deletion frontend/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VUE_APP_VERSION="20231227"
VUE_APP_VERSION="20240109"
4 changes: 2 additions & 2 deletions frontend/src/components/loot_manager/per_item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ export default class PerItemLootManager extends Vue {
getGreedReceived(entry: GreedGear): number {
// Given an entry, return how many times that Character has received greed loot so far this tier
return this.loot.received[entry.character_name].greed
return this.loot.received[entry.character_name]?.greed || 0
}
getNeedReceived(entry: NeedGear): number {
// Given an entry, return how many times that Character has received need loot so far this tier
return this.loot.received[entry.character_name].need
return this.loot.received[entry.character_name]?.need || 0
}
// Functions to handle interacting with the API for handling loot handouts
Expand Down
18 changes: 2 additions & 16 deletions frontend/src/components/modals/changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,8 @@
</div>
<div class="card-content content">
<h2 class="has-text-primary subtitle">{{ version }}</h2>
<div class="divider"><i class="material-icons icon">auto_awesome</i> Happy Holidays and Happy New Year <i class="material-icons icon">auto_awesome</i></div>
<p>Hard to believe I've been at this for nearly 2 years now! Hope everyone had a good end to 2023 and a nice start to 2024. Roll on Dawntrail!!</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Navigation Changes <i class="material-icons icon">expand_more</i></div>
<p>The explanation for what colours mean has been moved to the Theme settings page, and removed from the navbar.</p>
<p>
A quick-switcher (similar to Discord's) has been added for faster moving between pages.
<ul>
<li>It's accessible through the navbar, or by pressing <code>Ctrl</code>+<code>K</code> on PC.</li>
<li>This menu allows you to type to search for pages, and select them via arrow keys or clicking/tapping.</li>
<li>It shows the top 5 most relevant items to your search, and when empty the list displays main character / team pages instead.</li>
</ul>
</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Other Fixes <i class="material-icons icon">expand_more</i></div>
<p>If a non-leader accesses the Team's Settings page, the redirect will now put them back on the correct page.</p>
<div class="divider"><i class="material-icons icon">expand_more</i> Fixes <i class="material-icons icon">expand_more</i></div>
<p>Fixed an issue in the Per-Item Loot Manager where having Team Members who haven't received loot would cause the dropdown to not work. (Thanks @natkr!)</p>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Sentry.init({
Vue,
dsn: 'https://[email protected]/6180221',
logErrors: true,
release: 'savageaim@20231227',
release: 'savageaim@20240109',
integrations: [
new Sentry.BrowserTracing({
routingInstrumentation: Sentry.vueRouterInstrumentation(router),
Expand Down

0 comments on commit 3a4b0cb

Please sign in to comment.