After merge correction

camptocamp · Feb 19, 2018 · da45ddc · da45ddc
1 parent 7859926
commit da45ddc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/contribs/gmf/src/authentication/component.js b/contribs/gmf/src/authentication/component.js
@@ -361,7 +361,7 @@ gmf.authentication.component.AuthenticationController_ = class {
   /**
    * @private
    */
-  onUserChange() {
+  onUserChange_() {
     if (this.gmfUser.is_password_changed === false && this.forcePasswordChange) {
       const gettextCatalog = this.gettextCatalog;
       const msg = gettextCatalog.getString('You must change your password.');

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -413,7 +413,7 @@ gmf.controllers.AbstractAppController = function(config, $scope, $injector) {
    * @private
    */
   this.updateCurrentBackgroundLayer_ = function(skipPermalink) {
-    this.gmfThemes_.getBgLayers(this.dimensions).then((layers) => {
+    this.gmfThemes_.getBgLayers().then((layers) => {
       let background;
       if (!skipPermalink) {
         // get the background from the permalink
@@ -645,7 +645,7 @@ gmf.controllers.AbstractAppController.prototype.initLanguage = function() {
  * @private
  */
 gmf.controllers.AbstractAppController.prototype.setDefaultBackground_ = function(theme) {
-  this.gmfThemes_.getBgLayers(this.dimensions).then((layers) => {
+  this.gmfThemes_.getBgLayers().then((layers) => {
     let layer;
 
     // get the background from the permalink

diff --git a/contribs/gmf/src/print/component.js b/contribs/gmf/src/print/component.js
@@ -12,6 +12,7 @@ goog.require('ngeo.print.Service');
 goog.require('ngeo.print.Utils');
 goog.require('ngeo.query.MapQuerent');
 goog.require('ol.array');
+goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Group');
 goog.require('ol.Observable');