Merge branch 'master' of gits-15.sys.kth.se:ELAB/ELAB-partsearch
This commit is contained in:
@@ -66,7 +66,8 @@ def alter(partID):
|
||||
file = request.files['file']
|
||||
filename = secure_filename(file.filename)
|
||||
file.save(os.path.join('/srv/datasheets', filename))'''
|
||||
print dict(request)
|
||||
print dict(request.data)
|
||||
print dict(request.files)
|
||||
|
||||
def connect(user, password, db, host='localhost', port=5432):
|
||||
'''Returns a connection and a metadata object'''
|
||||
|
||||
+3
-3
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user