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

Merge pull request #351 from ZmagoD/zd_SCI_789

Browse source 
adds error message in samples table dropdown [fixes SCI-789]
This commit is contained in:
Zmago Devetak 2016-12-15 11:05:00 +01:00 committed by GitHub
commit 9b0d0b23dc
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -946,17 +946,14 @@ function changeToEditMode() {
'>' +
'<i class="grippy"></i> ' +
'<span class="text">' + generateColumnNameTooltip(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="ok glyphicon glyphicon-ok" style="display: none;"></span>' +
'<span class="cancel glyphicon glyphicon-remove" style="display: none;"></span>' +
'<span class="vis glyphicon ' + visClass + '"></span> ' +
'<span class="edit glyphicon glyphicon-pencil ' + editClass + '">' +
'</span> ' +
'<span class="del glyphicon glyphicon-trash ' + delClass + '">' +
'</span>' +
'</span>' +
'</li>';
'<span class="edit glyphicon glyphicon-pencil ' + editClass + '"></span>' +
'<span class="del glyphicon glyphicon-trash ' + delClass + '"></span>' +
'</span></span></li>';
dropdownList.append(html);
}
});
@ -1043,13 +1040,23 @@ function changeToEditMode() {
data: {custom_field: {name: newName}},
dataType: 'json',
success: function() {
dropdownList.sortable('enable');
$(li).clearFormErrors();
text.html(generateColumnNameTooltip(newName));
$(table.columns().header()).filter('#' + id)
.html(generateColumnNameTooltip(newName));
cancelEditMode();
},
error: function(xhr) {
// TODO
error: function(xhr, ajaxOptions, thrownError) {
dropdownList.sortable('disable');
$(li).clearFormErrors();
var msg = $.parseJSON(xhr.responseText);
renderFormError(event,
$(li).find('.text-edit'),
Object.keys(msg)[0] + ' '+ msg.name.toString());
var verticalHeight = $(li).offset().top;
dropdownList.scrollTo(verticalHeight,0);
}
});
}
@ -1058,6 +1065,11 @@ function changeToEditMode() {
dropdownList.on('click', '.edit:not(.disabled)', function(event) {
event.stopPropagation();
// Clear all input errors
_.each(dropdownList, function(el) {
$(el).clearFormErrors();
});
cancelEditMode();
var self = $(this);
@ -1098,6 +1110,7 @@ function changeToEditMode() {
dropdownList.sortable('enable');
var self = $(this);
var li = self.closest('li');
$(li).clearFormErrors();
editColumn(li);
});
@ -1108,6 +1121,7 @@ function changeToEditMode() {
dropdownList.sortable('enable');
var self = $(this);
var li = self.closest('li');
$(li).clearFormErrors();
editColumn(li);
}
});
@ -1118,7 +1132,7 @@ function changeToEditMode() {
dropdownList.sortable('enable');
var self = $(this);
var li = self.closest('li');
$(li).clearFormErrors();
columnEditMode = false;
li.removeClass('editing');

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

@ -1681,7 +1681,8 @@ textarea.textarea-sm {
}
.cancel {
margin-right: 28px;
margin-left: 5px;
margin-right: 15px;
}
.vis {
@ -1695,6 +1696,16 @@ textarea.textarea-sm {
.del {
}
}
.help-block {
display: inline-block;
margin-bottom: 0;
margin-left: 25px;
}
}
.add-new-column-form .help-block {
margin-left: 0;
}
th.custom-field .modal-tooltiptext {