projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NOTICKET: Fix merge issues caused by tool
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
api
/
packageFileHandler.js
diff --git
a/skyquake/plugins/composer/api/packageFileHandler.js
b/skyquake/plugins/composer/api/packageFileHandler.js
index
cc9cca7
..
b38abde
100644
(file)
--- a/
skyquake/plugins/composer/api/packageFileHandler.js
+++ b/
skyquake/plugins/composer/api/packageFileHandler.js
@@
-6,7
+6,7
@@
var constants = require('../../../framework/core/api_utils/constants.js');
var fs = require('fs');
var _ = require('lodash');
var fs = require('fs');
var _ = require('lodash');
-PackageFileHandler = {};
+
var
PackageFileHandler = {};
function deleteFile(filename) {
setTimeout(function() {
function deleteFile(filename) {
setTimeout(function() {
@@
-18,7
+18,7
@@
function checkStatus(req, transactionId, isUpdate) {
var upload_server = req.query['upload_server'];
var headers = _.extend({},
{
var upload_server = req.query['upload_server'];
var headers = _.extend({},
{
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}
);
var type = isUpdate ? 'update' : 'upload';
}
);
var type = isUpdate ? 'update' : 'upload';