Bug fixing after rebasing on top of Master

This commit is contained in:
Erik Ziegler committed 2016-11-15 08:24:30 +01:00
1 parent cd5a1277aa
commit 9ac196a916
5 files changed
+118 -7

No files matched your search

@@ -269,8 +269,6 @@ Connection.prototype.associate = function(options, callback) {
socket.setCalledAe(hostAE);
socket.setCallingAE(sourceAE);
console.log(peerInfo);
nativeSocket.connect({
host: peerInfo.host,
port: peerInfo.port
@@ -1,4 +1,3 @@
import { CurrentServer, Servers } from 'meteor/ohif:study-list/both/collections.js';
/**
* Retrieves the current server configuration used to retrieve studies
*/
@@ -13,9 +13,6 @@ Meteor.methods({
throw 'No properly configured server was available over DICOMWeb or DIMSE.';
}
console.log(server);
console.log(Services);
if (server.type === 'dicomWeb') {
return Services.QIDO.Studies(server, filter);
} else if (server.type === 'dimse') {
@@ -18,7 +18,6 @@ Meteor.startup(() => {
ServerConfiguration.clean(Meteor.settings);
// TODO: Make the error messages more clear
// console.log('------ Testing Meteor Settings ------');
// Taking this out for now to prevent confusion.
// check(Meteor.settings, ServerConfiguration);