Changeset 1442

Timestamp:

May 9, 2016, 1:49:00 PM (5 years ago)

Author:

jrpelegrina

Message:

Fix slave_blacklist

Location:

zero-center/trunk/fuentes

Files:

• install-files/usr/share/zero-center/zero-center.py (modified) (1 diff)
• n4dvars/SLAVE_BLACKLIST (modified) (1 diff)

zero-center/trunk/fuentes/install-files/usr/share/zero-center/zero-center.py

@@ -1059 +1059 @@
         
         def app_clicked(self,widget,app):
-                if not os.environ["MASTER_SERVER_IP"]:
-                        if self.blacklist[app]:
-                                self.open_dialog("Warning",_("<b>%s</b> Operation not allowed on a slave server"),False)
-                                return -1
+                if  "MASTER_SERVER_IP" in os.environ:
+                        if app["ID"] in self.blacklist:
+                                self.open_dialog("Warning",_("Operation not allowed on a slave server"),False)
+                                return -1
                 if app["ID"] in self.configured_apps:
                         ret=self.open_dialog("Warning",_("<b>%s</b> is already configured. Do you want to execute it again?")%self.get_name(app),True)

zero-center/trunk/fuentes/n4dvars/SLAVE_BLACKLIST

@@ -11 +11 @@
                         "install-moodle": ["moodle"],
                         "lliurex-owncloud":["owncloud"],
-                        "lliurex-pmb-installer":["pmb","opac"],
+                        "zero-lliurex-pmb-installer":["pmb","opac"],
                         "lliurex-freeradius":[]
                 },