[icinga-checkins] icinga.org: icinga-web/next: Fix that you can not login

git at icinga.org git at icinga.org
Wed Nov 20 10:30:31 CET 2013


Module: icinga-web
Branch: next
Commit: 7d1a4861d812c375f61b8d98f17bcb7c80771c78
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7d1a4861d812c375f61b8d98f17bcb7c80771c78

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Nov 20 10:28:47 2013 +0100

Fix that you can not login

Change spec file for apache rights on tmp directory and test
that a user is logged in before start refresh task on a
secured url action.

fixes #5107

---

 app/modules/AppKit/lib/js/AppKitNavBar.js |    6 ++++--
 icinga-web.spec                           |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/modules/AppKit/lib/js/AppKitNavBar.js b/app/modules/AppKit/lib/js/AppKitNavBar.js
index 774ca3c..af10bb9 100644
--- a/app/modules/AppKit/lib/js/AppKitNavBar.js
+++ b/app/modules/AppKit/lib/js/AppKitNavBar.js
@@ -143,8 +143,10 @@ AppKit.util.AppKitNavBar = Ext.extend(Ext.Container,{
     },
 
     addReloadStatus : function(itemsCfg) {
-        var item = new Cronk.menu.ReloadStatus();
-        itemsCfg.push({xtype: 'container',items:item});
+        if (this.hasAuth === true) {
+            var item = new Cronk.menu.ReloadStatus();
+            itemsCfg.push({xtype: 'container',items:item});
+        }
     },
 
     addSearchBox : function(itemsCfg) {
diff --git a/icinga-web.spec b/icinga-web.spec
index b442cca..51260d0 100644
--- a/icinga-web.spec
+++ b/icinga-web.spec
@@ -281,6 +281,8 @@ fi
 %attr(2775,%{apacheuser},%{apachegroup}) %dir %{logdir}
 %attr(-,%{apacheuser},%{apachegroup}) %{cachedir}
 %attr(-,%{apacheuser},%{apachegroup}) %{cachedir}/config
+# data directory writable for web server
+%attr(-,%{apacheuser},%{apachegroup})  %{_datadir}/%{name}/app/data/tmp
 # binaries
 %defattr(-,root,root)
 %{_bindir}/%{name}-clearcache





More information about the icinga-checkins mailing list