]> source.dussan.org Git - sonarqube.git/commitdiff
fix display of admin extensions
authorStas Vilchik <vilchiks@gmail.com>
Mon, 16 Nov 2015 09:55:47 +0000 (10:55 +0100)
committerStas Vilchik <vilchiks@gmail.com>
Mon, 16 Nov 2015 09:55:47 +0000 (10:55 +0100)
server/sonar-web/src/main/js/main/nav/app.js

index 14576f59cdd89f49334f619d7d663e07a6358e5a..af45c03ff02179383779edcfc1ae6f90f8792f41 100644 (file)
@@ -55,9 +55,10 @@ export default class App {
 
   static renderSettingsNav (options) {
     return getSettingsNavigation().then(r => {
-      const el = document.getElementById('context-navigation');
+      let el = document.getElementById('context-navigation');
+      let opts = _.extend(r, options);
       if (el) {
-        ReactDOM.render(<SettingsNav {...options}/>, el);
+        ReactDOM.render(<SettingsNav {...opts}/>, el);
       }
       return r;
     });