Bug fix/gravatar ui fix (arangodb#9211)

hkernbach · mchacki · commit 677ffdc69248 · 2019-06-12T15:20:15.000+02:00
* fixed editing of users in the web ui when gravatar was enabled

* changelog

* Update userManagementView.js

rm console log
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 devel
 -----
 
+* Fixed editing a user within the web UI if the user added a gravatar profile picture
+
+* allow pregel to select the shard key via `shardKeyAttribute` in pregel start parameters
+
+* Added --server.jwt-secret-keyfile to arangosh.
+
 * fixed internal issue #4040: gharial api is now checking existence of `_from` and `_to` vertices
   during edge replacements and edge updates
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js
@@ -208,7 +208,12 @@
       }
 
       if ($(e.currentTarget).hasClass('tile')) {
-        e.currentTarget = $(e.currentTarget).find('.fa');
+        if ($(e.currentTarget).find('.fa').attr('id')) {
+          e.currentTarget = $(e.currentTarget).find('.fa');
+        } else {
+          // check if gravatar icon is enabled
+          e.currentTarget = $(e.currentTarget).find('.icon');
+        }
       }
 
       this.collection.fetch({

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,12 @@`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`if ($(e.currentTarget).hasClass('tile')) {`
`211`		`- e.currentTarget = $(e.currentTarget).find('.fa');`
	`211`	`+ if ($(e.currentTarget).find('.fa').attr('id')) {`
	`212`	`+ e.currentTarget = $(e.currentTarget).find('.fa');`
	`213`	`+ } else {`
	`214`	`+ // check if gravatar icon is enabled`
	`215`	`+ e.currentTarget = $(e.currentTarget).find('.icon');`
	`216`	`+ }`
`212`	`217`	`}`
`213`	`218`
`214`	`219`	`this.collection.fetch({`