Some quick fixes
This commit is contained in:
@@ -55,7 +55,7 @@ def query(filter, query):
|
|||||||
|
|
||||||
@app.route('/parts/getfile/<filename>')
|
@app.route('/parts/getfile/<filename>')
|
||||||
def getfile(filename):
|
def getfile(filename):
|
||||||
if(re.match('^[\w-_]+\.pdf$', filename) == None):
|
if(re.match('^[\w\-_]+\.pdf$', filename) == None):
|
||||||
return 'No injections pls.'
|
return 'No injections pls.'
|
||||||
|
|
||||||
return send_from_directory('/srv/datasheets/', 'filename')
|
return send_from_directory('/srv/datasheets/', 'filename')
|
||||||
@@ -72,7 +72,7 @@ def alter(partID):
|
|||||||
if len(request.files) != 0:
|
if len(request.files) != 0:
|
||||||
datasheet_file = request.files['datasheet-file']
|
datasheet_file = request.files['datasheet-file']
|
||||||
datasheet_filename = secure_filename(datasheet_file.filename)
|
datasheet_filename = secure_filename(datasheet_file.filename)
|
||||||
datasheet_file.save('/srv/datasheets/' + filename)
|
datasheet_file.save('/srv/datasheets/' + datasheet_filename)
|
||||||
else:
|
else:
|
||||||
datasheet_filename = ''
|
datasheet_filename = ''
|
||||||
r = db_engine.execute(s, block=request.form['block'],
|
r = db_engine.execute(s, block=request.form['block'],
|
||||||
@@ -96,7 +96,7 @@ def alter(partID):
|
|||||||
if len(request.files) != 0:
|
if len(request.files) != 0:
|
||||||
datasheet_file = request.files['datasheet-file']
|
datasheet_file = request.files['datasheet-file']
|
||||||
datasheet_filename = secure_filename(datasheet_file.filename)
|
datasheet_filename = secure_filename(datasheet_file.filename)
|
||||||
datasheet_file.save('/srv/datasheets/' + filename)
|
datasheet_file.save('/srv/datasheets/' + datasheet_filename)
|
||||||
# TODO: Remove old datasheet
|
# TODO: Remove old datasheet
|
||||||
else:
|
else:
|
||||||
datasheet_filename = l[0]['datasheet']
|
datasheet_filename = l[0]['datasheet']
|
||||||
|
|||||||
+2
-1
@@ -189,6 +189,7 @@ function show_part_info(partID) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
$.ajaxSetup({ cache: false });
|
||||||
$('.search-bar').on('keyup', function() {
|
$('.search-bar').on('keyup', function() {
|
||||||
var query = $('.search-bar').val();
|
var query = $('.search-bar').val();
|
||||||
var filter = 0;
|
var filter = 0;
|
||||||
@@ -227,7 +228,7 @@ $(document).ready(function() {
|
|||||||
newResults += '</div>';
|
newResults += '</div>';
|
||||||
|
|
||||||
newResults += '<div class="results-notes">';
|
newResults += '<div class="results-notes">';
|
||||||
if (data[i].notes != null)
|
if (data[i].notes != null && notes.length > 0)
|
||||||
newResults += '<div class="tooltip"><i class="fa fa-sicky-note"></i><span class="tooltiptext">' + data[i].notes + '</span></div>';
|
newResults += '<div class="tooltip"><i class="fa fa-sicky-note"></i><span class="tooltiptext">' + data[i].notes + '</span></div>';
|
||||||
//newResults += data[i].notes;
|
//newResults += data[i].notes;
|
||||||
newResults += '</div>';
|
newResults += '</div>';
|
||||||
|
|||||||
Reference in New Issue
Block a user