Changeset c65ee3 in indico

Timestamp:

03/11/11 16:23:31 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

2f223d

Parents:

3edaba

Message:

[FIX] Avoiding doubling epayment modules

Files:

• indico/MaKaC/epayment.py (modified) (3 diffs)
• indico/MaKaC/plugins/EPayment/payPal/__init__.py (modified) (1 diff)
• indico/MaKaC/plugins/EPayment/worldPay/__init__.py (modified) (1 diff)
• indico/MaKaC/plugins/EPayment/yellowPay/__init__.py (modified) (1 diff)
• indico/MaKaC/webinterface/pages/epayments.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

indico/MaKaC/epayment.py

@@ -23 +23 @@
 from MaKaC.common.Locators import Locator
 from MaKaC.trashCan import TrashCanManager
-from MaKaC.plugins import PluginLoader, pluginId
+from MaKaC.plugins import PluginLoader
 
 class EPayment(Persistent):
@@ -54 +54 @@
         changed = False
         for mod in epaymentModules:
-            name = pluginId(mod)
+            name = mod.MODULE_ID
             if name not in self.payMods:
                 self.payMods[name] = mod.epayment.getPayMod()
@@ -64 +64 @@
                                   mod.epayment.getPayModClass()):
                     newMod = mod.epayment.getPayMod()
-                    self.payMods[pluginId(mod)] = newMod
+                    self.payMods[mod.MODULE_ID] = newMod
                     changed = True
 

indico/MaKaC/plugins/EPayment/payPal/__init__.py

@@ -24 +24 @@
     }
 
-MODULE_ID = 'payPal'
+MODULE_ID = 'PayPal'
 
 modules = {}

indico/MaKaC/plugins/EPayment/worldPay/__init__.py

@@ -24 +24 @@
     }
 
-MODULE_ID = 'worldPay'
+MODULE_ID = 'WorldPay'
 
 modules = {}

indico/MaKaC/plugins/EPayment/yellowPay/__init__.py

@@ -24 +24 @@
     }
 
-MODULE_ID = 'yellowPay'
+MODULE_ID = 'YellowPay'
 
 modules = {}

indico/MaKaC/webinterface/pages/epayments.py

@@ -71 +71 @@
 
             # CERN Plugin: Just admins can see and modify it
-            if gs.getId() == "CERNYellowPay":
+            from MaKaC.plugins.EPayment.CERNYellowPay import  MODULE_ID
+            if gs.getId() == MODULE_ID:
                 minfo = HelperMaKaCInfo.getMaKaCInfoInstance()
                 al = minfo.getAdminList()
@@ -77 +78 @@
                     from MaKaC.plugins.base import PluginsHolder
                     endis="enable"
-                    departmentName = PluginsHolder().getPluginType("EPayment").getPlugin("CERNYellowPay").getOption("FPDepartmentName").getValue()
-                    emailAddress = PluginsHolder().getPluginType("EPayment").getPlugin("CERNYellowPay").getOption("FPEmaillAddress").getValue()
+                    departmentName = PluginsHolder().getPluginType("EPayment").getPlugin(MODULE_ID).getOption("FPDepartmentName").getValue()
+                    emailAddress = PluginsHolder().getPluginType("EPayment").getPlugin(MODULE_ID).getOption("FPEmaillAddress").getValue()
                     if gs.isEnabled():
                         endis="disable"

setup.py

@@ -674 +674 @@
             EPayment.yellowPay = MaKaC.plugins.EPayment.yellowPay
             EPayment.skipjack = MaKaC.plugins.EPayment.skipjack
+            EPayment.CERNYellowPay = MaKaC.plugins.EPayment.CERNYellowPay
 
             InstantMessaging.XMPP = MaKaC.plugins.InstantMessaging.XMPP