scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-11 15:45:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #612 from mlorb/ml_sci_1250

Browse source 
Fix sample page bugs when editing column name [SCI-1250]
This commit is contained in:
mlorb 2017-05-11 13:48:20 +02:00 • committed by GitHub
commit 219921ee33
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/samples/sample_datatable.js.erb
View file

@ -154,7 +154,10 @@ function dataTableInit() {
fnInitComplete: function(oSettings, json) { fnInitComplete: function(oSettings, json) {
// Reload correct column order and visibility (if you refresh page) // Reload correct column order and visibility (if you refresh page)
for (var i = 0; i < table.columns()[0].length; i++) { for (var i = 0; i < table.columns()[0].length; i++) {
var visibility = myData.columns[i].visible; var visibility = false;
if (myData.columns[i]) {
visibility = myData.columns[i].visible;
}
if (typeof (visibility) === 'string') { if (typeof (visibility) === 'string') {
visibility = (visibility === 'true'); visibility = (visibility === 'true');
} }
@ -976,7 +979,6 @@ function changeToEditMode() {
// Add number of columns // Add number of columns
$('#samples').data('num-columns', $('#samples').data('num-columns',
$('#samples').data('num-columns') + 1); $('#samples').data('num-columns') + 1);
// Add column to table (=table header) // Add column to table (=table header)
originalHeader.append( originalHeader.append(
'<th class="custom-field" id="' + data.id + '" ' + '<th class="custom-field" id="' + data.id + '" ' +
@ -1181,7 +1183,7 @@ function changeToEditMode() {
text.html(generateColumnNameTooltip(newName)); text.html(generateColumnNameTooltip(newName));
$(table.columns().header()).filter('#' + id) $(table.columns().header()).filter('#' + id)
.html(generateColumnNameTooltip(newName)); .html(generateColumnNameTooltip(newName));
originalHeader.find('#' + id).html(newName);
cancelEditMode(); cancelEditMode();
initHeaderTooltip(); initHeaderTooltip();
}, },