scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 01:14:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

adds error message in samples table dropdown [fixes SCI-789]

Browse source
This commit is contained in:
zmagod 2016-12-13 17:08:19 +01:00
parent e5a0ad9b23
commit d9971b4502
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/assets/javascripts/samples/sample_datatable.js
View file

@ -937,15 +937,15 @@ function changeToEditMode() {
'>' + '>' +
'<i class="grippy"></i> ' + '<i class="grippy"></i> ' +
'<span class="text">' + el.innerText + '</span> ' + '<span class="text">' + el.innerText + '</span> ' +
'<input type="text" class="text-edit form-control" style="display: none;" />' + '<span class="form-group"><input type="text" class="text-edit form-control" style="display: none;" />' +
'<span class="pull-right controls">' + '<span class="pull-right controls">' +
'<span class="ok glyphicon glyphicon-ok" style="display: none;"></span>' + '<span class="ok glyphicon glyphicon-ok" style="display: none;"></span>' +
'<span class="cancel glyphicon glyphicon-remove" style="display: none;"></span>' + '<span class="cancel glyphicon glyphicon-remove" style="display: none;"></span>' +
'<span class="vis glyphicon ' + visClass + '"></span> ' + '<span class="vis glyphicon ' + visClass + '"></span> ' +
'<span class="edit glyphicon glyphicon-pencil ' + editClass + '">' + '<span class="edit glyphicon glyphicon-pencil ' + editClass + '">' +
'</span> ' +
'<span class="del glyphicon glyphicon-trash ' + delClass + '">' +
'</span>' + '</span>' +
'<span class="del glyphicon glyphicon-trash ' + delClass + '">' +
'</span></span>' +
'</span>' + '</span>' +
'</li>'; '</li>';
dropdownList.append(html); dropdownList.append(html);
@ -1034,10 +1034,15 @@ function changeToEditMode() {
success: function() { success: function() {
text.text(newName); text.text(newName);
$(table.columns().header()).filter('#' + id).text(newName); $(table.columns().header()).filter('#' + id).text(newName);
$(li).clearFormErrors();
cancelEditMode(); cancelEditMode();
}, },
error: function(xhr) { error: function(xhr, ajaxOptions, thrownError) {
// TODO $(li).clearFormErrors();
var msg = $.parseJSON(xhr.responseText);
renderFormError(event,
$(li).find('.text-edit'),
Object.keys(msg)[0] + ' '+ msg.name.toString());
} }
}); });
} }
@ -1067,7 +1072,10 @@ function changeToEditMode() {
controls.hide(); controls.hide();
textEdit.css('display', ''); // show() doesn't work textEdit.css('display', ''); // show() doesn't work
controlsEdit.css('display', ''); // show() doesn't work controlsEdit.css('display', ''); // show() doesn't work
dropdownList.sortable('disable');
dropdownList.on('click', function(ev) {
ev.stopPropagation();
});
// Focus input // Focus input
textEdit.focus(); textEdit.focus();
}); });
@ -1080,8 +1088,10 @@ function changeToEditMode() {
// On ok buttons click // On ok buttons click
dropdownList.on('click', '.ok', function(event) { dropdownList.on('click', '.ok', function(event) {
event.stopPropagation(); event.stopPropagation();
dropdownList.sortable('enable');
var self = $(this); var self = $(this);
var li = self.closest('li'); var li = self.closest('li');
$(li).clearFormErrors();
editColumn(li); editColumn(li);
}); });
@ -1089,8 +1099,10 @@ function changeToEditMode() {
dropdownList.on('keydown', 'input.text-edit', function(event) { dropdownList.on('keydown', 'input.text-edit', function(event) {
if (event.keyCode === 13) { if (event.keyCode === 13) {
event.preventDefault(); event.preventDefault();
dropdownList.sortable('enable');
var self = $(this); var self = $(this);
var li = self.closest('li'); var li = self.closest('li');
$(li).clearFormErrors();
editColumn(li); editColumn(li);
} }
}); });
@ -1098,9 +1110,10 @@ function changeToEditMode() {
// On cancel buttons click // On cancel buttons click
dropdownList.on('click', '.cancel', function(event) { dropdownList.on('click', '.cancel', function(event) {
event.stopPropagation(); event.stopPropagation();
dropdownList.sortable('enable');
var self = $(this); var self = $(this);
var li = self.closest('li'); var li = self.closest('li');
$(li).clearFormErrors();
columnEditMode = false; columnEditMode = false;
li.removeClass('editing'); li.removeClass('editing');
@ -1206,6 +1219,7 @@ function changeToEditMode() {
}); });
$('#samples-columns-dropdown').on('show.bs.dropdown', function() { $('#samples-columns-dropdown').on('show.bs.dropdown', function() {
loadColumnsNames(); loadColumnsNames();
dropdownList.sortable('enable');
}); });
} }

13
app/assets/stylesheets/themes/scinote.scss
View file

@ -1676,7 +1676,8 @@ textarea.textarea-sm {
} }
.cancel { .cancel {
margin-right: 28px; margin-right: 15px;
margin-left: 5px;
} }
.vis { .vis {
@ -1690,4 +1691,14 @@ textarea.textarea-sm {
.del { .del {
} }
} }
.help-block {
display: inline-block;
margin-bottom: 0;
margin-left: 25px;
}
}
.add-new-column-form .help-block {
margin-left: 0;
} }