Fixed bug when an article has no creator/changer/author (#93)

* Fixed bug when an article has no creator/changer/author * Code clean up * Added missing return statement
sulu · Mar 7, 2017 · 17cb175 · 17cb175
1 parent d663b9a
commit 17cb175
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Resources/public/dist/components/articles/edit/settings/main.js b/Resources/public/dist/components/articles/edit/settings/main.js
diff --git a/Resources/public/js/components/articles/edit/settings/main.js b/Resources/public/js/components/articles/edit/settings/main.js
@@ -229,7 +229,7 @@ define([
             var changerDef = $.Deferred();
             var authorDef = $.Deferred();
 
-            if (data.creator === data.changer) {
+            if (data.creator && data.changer && data.creator === data.changer) {
                 this.loadUser(data.creator).done(function(model) {
                     creatorDef.resolve(model.get('fullName'), data.created);
                     changerDef.resolve(model.get('fullName'), data.changed);
@@ -279,9 +279,16 @@ define([
          * @return {*}
          */
         loadUser: function(id) {
-            var deferred = $.Deferred(),
-                user = new User({id: id});
+            var deferred = $.Deferred();
+
+            // when no id set return here
+            if (!id) {
+                deferred.reject();
+
+                return deferred;
+            }
 
+            var user = new User({id: id});
             user.fetch({
                 global: false,