Merge branch 'annotators-issue' into 'master'

Annotators issue

See merge request minerva/core!680

frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js

@@ -547,6 +547,10 @@ ChooseAnnotatorsDialog.prototype.getParameterName = function (parameter) {
  * @param {User} user
  */
 ChooseAnnotatorsDialog.prototype.copyAnnotatorsToChildren = function (from, to, user) {
+  if (user.getPreferences()._elementAnnotators[from.className] === undefined) {
+    logger.warn("Cannot copy annotator from " + from.className + " to " + to.className + ". Annotators don't exist");
+    user.getPreferences()._elementAnnotators[from.className] = user.getPreferences()._elementAnnotators[to.className];
+  }
   user.getPreferences()._elementAnnotators[to.className] = user.getPreferences()._elementAnnotators[from.className];
 };
 module.exports = ChooseAnnotatorsDialog;

frontend-js/src/test/js/map/data/UserPreferences-test.js

@@ -58,5 +58,9 @@ describe('UserPreferences', function () {
     });
   });
 
-
+  it("toExport", function () {
+    return ServerConnector.getLoggedUser().then(function (user) {
+      assert.ok(user.getPreferences().toExport());
+    })
+  });
 });