Permalink
Browse files

Merge remote-tracking branch 'kaspermarkus/master'

* kaspermarkus/master:
  Fixed a small bug in tranformer that caused it to crash if an application was found for which the user has no application specific preferences.
  • Loading branch information...
2 parents 7b26690 + a9a8fb7 commit a9e7a1ac71eee46788b743143af16743b040b495 @colinbdclark colinbdclark committed Apr 9, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 gpii/node_modules/transformer/src/js/Transformer.js
@@ -46,6 +46,9 @@ https://github.com/gpii/universal/LICENSE.txt
};
gpii.transformer.preferencesToSettings = function (preferences, solution, specificPreferences) {
+ if (!specificPreferences) {
+ return {};
+ }
var settings = {}; //fluid.model.transformWithRules(preferences, solution.capabilities);
var mergedSettings = fluid.merge(null, settings, specificPreferences.parameters);

0 comments on commit a9e7a1a

Please sign in to comment.