Merge Pathways rework into main - #41
Merged
Merged
Conversation
Merge upstream `main` into `pathway_rework`
change shit
Fix reloading too many times
Make the referrals url thing actually work
directive comments
button when maximised
…into pathway_rework
…into pathway_rework
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| if item_name == "" or item_description == "": | ||
| messages.error(request, "Item name and description are required!") | ||
| return redirect(request.path_info) |
| stock = int(stock_raw) | ||
| except ValueError: | ||
| messages.error(request, "Item stock must be a whole number!") | ||
| return redirect(request.path_info) |
| return redirect(request.path_info) | ||
| if stock < 0: | ||
| messages.error(request, "Item stock cannot be negative!") | ||
| return redirect(request.path_info) |
| price = int(price_raw) | ||
| except ValueError: | ||
| messages.error(request, f"Price for {region.name} must be a whole number!") | ||
| return redirect(request.path_info) |
| for region, price in regional_prices: | ||
| _ = ShopItemRegionalPricing.objects.create(region=region, item=shop_item, price=price) | ||
| messages.success(request, f"Created new shop listing for {item_name}") | ||
| return redirect(request.path_info) |
| messages.success(request, f"Created new shop listing for {item_name}") | ||
| return redirect(request.path_info) | ||
|
|
||
| return redirect(request.path_info) |
| self.audit_log.additional_context["permission_changed"] = f"'{key}' set to '{value}'" | ||
| messages.success(request, f"Set permission '{key}' to '{value}' successfully.") | ||
| return redirect(self.request.path+"#adminperms") | ||
| return redirect(f"{self.request.path}#adminperms") |
| profile.region = get_object_or_404(ShopRegion, id=request.POST.get("region")) | ||
| profile.save() | ||
|
|
||
| return redirect(request.get_full_path()) |
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
Collaborator
Author
|
LGTM |
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.