kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 03:04:36 +00:00
Code Issues Projects Releases Wiki Activity

Table options: Only allow columns to be grouped for which it makes sense (closes #1535)

Browse Source
This commit is contained in:
Bernd Bestel
2022-02-15 18:40:42 +01:00
parent e9a7b10730
commit 926b7d8aea
20 changed files with 86 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/js/grocy.js
View File

@@ -989,7 +989,8 @@ $(".change-table-columns-visibility-button").on("click", function(e)
dataTable.columns().every(function()
{
var index = this.index();
var title = $(this.header()).text();
var headerCell = $(this.header());
var title = headerCell.text();
var visible = this.visible();
if (title.isEmpty() || title.startsWith("Hidden"))
@@ -997,7 +998,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
return;
}
var shadowColumnIndex = $(this.header()).attr("data-shadow-rowgroup-column");
var shadowColumnIndex = headerCell.attr("data-shadow-rowgroup-column");
if (shadowColumnIndex)
{
index = shadowColumnIndex;
@@ -1022,7 +1023,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
</label> \
</div>';
if (rowGroupDefined)
if (rowGroupDefined && headerCell.hasClass("allow-grouping"))
{
var rowGroupChecked = "";
if (dataTable.rowGroup().enabled() && dataTable.rowGroup().dataSrc() == index)
@@ -1046,10 +1047,25 @@ $(".change-table-columns-visibility-button").on("click", function(e)
}
});
var message = '<div class="text-center"><h5>' + __t('Table options') + '</h5><hr><h5 class="mb-0">' + __t('Hide/view columns') + '</h5><div class="text-left form-group">' + columnCheckBoxesHtml + '</div></div>';
var message = '\
<div class="text-center"> \
<h5>' + __t('Table options') + '</h5> \
<hr> \
<h5 class="mb-0">' + __t('Hide/view columns') + '</h5> \
<div class="text-left form-group"> \
' + columnCheckBoxesHtml + ' \
</div> \
</div>';
if (rowGroupDefined)
{
message += '<div class="text-center mt-1"><h5 class="pt-3 mb-0">' + __t('Group by') + '</h5><div class="text-left form-group">' + rowGroupRadioBoxesHtml + '</div></div>';
message += ' \
<div class="text-center mt-1"> \
<h5 class="pt-3 mb-0">' + __t('Group by') + '</h5> \
<div class="text-left form-group"> \
' + rowGroupRadioBoxesHtml + ' \
</div> \
</div>';
}
bootbox.dialog({