kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 10:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixed equipment edit button always pointed to the first equipment item (fixes #107)

Browse Source
This commit is contained in:
Bernd Bestel 2018-11-17 08:26:31 +01:00
parent 1a6849ad37
commit 0f73d849eb
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/viewjs/equipment.js
View File

@ -38,6 +38,7 @@ function DisplayEquipment(id)
{ {
$(".selected-equipment-name").text(equipmentItem.name); $(".selected-equipment-name").text(equipmentItem.name);
$("#description-tab-content").html(equipmentItem.description); $("#description-tab-content").html(equipmentItem.description);
$(".equipment-edit-button").attr("href", U("/equipment/" + equipmentItem.id.toString()));
if (equipmentItem.instruction_manual_file_name !== null && !equipmentItem.instruction_manual_file_name.isEmpty()) if (equipmentItem.instruction_manual_file_name !== null && !equipmentItem.instruction_manual_file_name.isEmpty())
{ {

4
views/equipment.blade.php
View File

@ -50,7 +50,7 @@
<div id="selectedEquipmentInstructionManualCard" class="card"> <div id="selectedEquipmentInstructionManualCard" class="card">
<div class="card-header"> <div class="card-header">
<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp; <i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}"> <a class="btn btn-info btn-sm btn-outline-info py-0 equipment-edit-button" href="#">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
</a> </a>
<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}"> <a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
@ -70,7 +70,7 @@
<div id="selectedEquipmentDescriptionCard" class="card"> <div id="selectedEquipmentDescriptionCard" class="card">
<div class="card-header"> <div class="card-header">
<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp; <i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}"> <a class="btn btn-info btn-sm btn-outline-info py-0 equipment-edit-button" href="#">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
</a> </a>
<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}"> <a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">