Merge branch 'master' of gits-15.sys.kth.se:ELAB/ELAB-partsearch

This commit is contained in:
Davide Bongiovanni
2017-06-06 19:17:10 +02:00
2 changed files with 5 additions and 4 deletions
+3 -3
View File
@@ -83,11 +83,11 @@ function save(partID) {
var quantity_v = $('#quantity-input').val();
var notes_v = $('#notes-input').val();
var datasheet = $('#datasheet-input')[0].files;
if(! partno.match(/^([a-zA-Z0-9]+\s*){1,3}$/g)) {
if(! partno_v.match(/^([a-zA-Z0-9]+\s*){1,3}$/g)) {
alert('Invalid part number format. Accepted: <Part-number-line-1> <Part-number-line-2> <Part-number-line-3>');
return;
}
if(! block.match(/^[0-9]+$/g)) {
if(! block_v.match(/^[0-9]+$/g)) {
alert('Invalid location field. Only numbers accepted.');
return;
}
@@ -149,7 +149,7 @@ function show_part_info(partID) {
$('#datasheet-info').text('<a href="https://www.elab.kth.se/parts/getfile/' + data.datasheet + '"><i class="fa fa-file-text" aria-hidden="true"></i></a>');
else
$('#datasheet-info').text(' ');
$('#edit-button').on('click', function() {
$('#edit-button').click(function() {
init_edit(partID);
});
overlay_in();