kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Adds a few small frontend fixes (#995)

Browse Source 
* Add a few instructions to the readme on how to get `grocy` running locally

* Fix toggle for header-clock

I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.

If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.

* Allow replacing a product picture when removing it at first

Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.

This patch allows to delete an image and add a new one in one go.

* Add `Save & return` button to product form

Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.

* Removed unneeded class

* Revert "Add a few instructions to the readme on how to get `grocy` running locally"

This reverts commit 6ffad1d3c729de9ce4bdd19aa87d7577dd2fcd36.

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
This commit is contained in:
Maximilian Bosch 2020-09-08 17:46:37 +02:00 committed by GitHub
parent 38bb205a55
commit 34ffdb2b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/grocy_clock.js
View File

@ -1,4 +1,4 @@
$("#show-clock-in-header").on("change", function()
$(document).on("change", "#show-clock-in-header", function()
{
CheckHeaderClockEnabled();
});

11
public/viewjs/productform.js
View File

@ -342,6 +342,12 @@ $("#allow_partial_units_in_stock").on("click", function()
Grocy.FrontendHelpers.ValidateForm("product-form");
});
$('#product-picture').change(function () {
if ($(this).val()) {
Grocy.DeleteProductPictureOnSave = false;
}
});
Grocy.DeleteProductPictureOnSave = false;
$('#delete-current-product-picture-button').on('click', function(e)
{
@ -405,6 +411,11 @@ Grocy.FrontendHelpers.ValidateForm('product-form');
$("#allow_partial_units_in_stock").click();
$("#allow_partial_units_in_stock").click();
$(document).on('click', '#save-product-button-continue', function () {
Grocy.ProductEditFormRedirectUri = "reload";
$('#save-product-button').click();
});
$(document).on('click', '.qu-conversion-delete-button', function(e)
{
var objectId = $(e.currentTarget).attr('data-qu-conversion-id');

4
views/productform.blade.php
View File

@ -371,8 +371,10 @@
'entity' => 'products'
))
<button id="save-product-button-continue"
class="btn btn-success mb-2">{{ $__t('Save & continue') }}</button>
<button id="save-product-button"
class="btn btn-success">{{ $__t('Save') }}</button>
class="btn btn-info mb-2">{{ $__t('Save') }}</button>
</form>
</div>