Bug fixing after rebasing on top of Master

This commit is contained in:
Erik Ziegler 2016-11-03 11:13:40 +01:00
parent cd5a1277aa
commit 9ac196a916
5 changed files with 118 additions and 7 deletions

View File

@ -0,0 +1,118 @@
accounts-base@1.2.14
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3
aldeed:template-extension@4.0.0
allow-deny@1.0.5
arsnebula:reactive-promise@0.9.1
autoupdate@1.3.12
babel-compiler@6.13.0
babel-runtime@0.1.13
base64@1.0.10
binary-heap@1.0.10
blaze@2.2.0
blaze-html-templates@1.0.5
blaze-tools@1.0.10
boilerplate-generator@1.0.11
caching-compiler@1.1.8
caching-html-compiler@1.0.7
callback-hook@1.0.10
check@1.2.4
clinical:router@2.0.19
clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0
coffeescript@1.11.1_2
ddp@1.2.5
ddp-client@1.3.2
ddp-common@1.2.7
ddp-rate-limiter@1.0.6
ddp-server@1.3.11
deps@1.0.12
design@0.0.1
diff-sequence@1.0.7
ecmascript@0.5.9
ecmascript-runtime@0.3.15
ejson@1.0.13
fastclick@1.0.13
fortawesome:fontawesome@4.6.3
geojson-utils@1.0.10
gilbertwat:bootstrap3-daterangepicker@1.3.21_1
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.2.10
id-map@1.0.9
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
iron:layout@1.0.12
johdirr:meteor-git-rev@0.0.4
jquery@1.11.10
launch-screen@1.1.0
livedata@1.0.18
localstorage@1.0.12
logging@1.1.16
mdg:validation-error@0.5.1
meteor@1.6.0
meteor-base@1.0.4
meteor-platform@1.2.6
minifier-css@1.2.15
minifier-js@1.2.15
minimongo@1.0.18
mobile-experience@1.0.4
mobile-status-bar@1.0.13
modules@0.7.7
modules-runtime@0.7.7
momentjs:moment@2.15.2
mongo@1.1.14
mongo-id@1.0.6
mrt:moment@2.8.1
natestrauser:select2@4.0.3
npm-mongo@2.2.11_2
observe-sequence@1.0.14
ohif:core@0.0.1
ohif:cornerstone@0.0.1
ohif:dicom-services@0.0.1
ohif:hanging-protocols@0.0.1
ohif:log@0.0.1
ohif:study-list@0.0.1
ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1
ordered-dict@1.0.9
peppelg:bootstrap-3-modal@1.0.4
practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2
promise@0.8.8
raix:eventemitter@0.1.3
random@1.0.10
rate-limit@1.0.6
reactive-dict@1.1.8
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
routepolicy@1.0.12
service-configuration@1.0.11
session@1.1.7
shell-server@0.2.1
silentcicero:jszip@0.0.4
spacebars@1.0.13
spacebars-compiler@1.0.13
standard-app-packages@1.0.9
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
stylus@2.513.6
templating@1.2.15
templating-compiler@1.2.15
templating-runtime@1.2.15
templating-tools@1.0.5
tracker@1.1.1
twbs:bootstrap@3.3.6
ui@1.0.12
underscore@1.0.10
url@1.0.11
validatejs@0.0.1
webapp@1.3.12
webapp-hashing@1.0.9

View File

@ -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

View File

@ -1,4 +1,3 @@
import { CurrentServer, Servers } from 'meteor/ohif:study-list/both/collections.js';
/**
* Retrieves the current server configuration used to retrieve studies
*/

View File

@ -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') {

View File

@ -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);