Changeset 1423 for HelpIM3

Timestamp:

02/24/11 04:27:20 (15 months ago)

Author:

winfried

Message:

Fixing editable pages in full.xml config. Make the application fall back
on the 'key' if no 'location' is defined for a resource.

Location:

HelpIM3/branches/chatgroups

Files:

• HelpIM/appl/application.py (modified) (2 diffs)
• config/sites/full.xml (modified) (6 diffs)

HelpIM3/branches/chatgroups/HelpIM/appl/application.py

@@ -311 +311 @@
                 scriptName = resourceConfig.script
                 location = resourceConfig.location
+                if not location:
+                    location = resourceConfig.key
                 packageName, className = self.getPackageName(site, location)
             else:
@@ -316 +318 @@
                 scriptName = resourceConfig.Class.script
                 location = resourceConfig.Class.id
+                if not location:
+                    location = resourceConfig.key
                 packageName, className = self.getPackageName(site, location)
             

HelpIM3/branches/chatgroups/config/sites/full.xml

@@ -25 +25 @@
 
 
-        <importFile name="/etc/HelpIM3/sensoor/import.xml" />
         <listOf__actionPerformed>
 
@@ -181 +180 @@
                 <page location="" module="auth" script="ShowLoginPanel"
                         allowCookies="True" />
-                <page location="setupSite" module="setup" script="setupSite" />
-                <page location="ImportSensoor" module="setup" script="ImportSensoor" />
                 <page location="login" module="auth" script="ShowLoginPanel"
                         authenticationNeeded="False" allowCookies="True" />
@@ -192 +189 @@
 
                 <!-- Intranet -->
-                <page location="EditNationalNews" module="intranet" script="EditNationalNews"
-                        allowCookies="True" />
-                <page location="ShowNationalNews" module="intranet" script="ShowNationalNews"
-                        allowCookies="True" />
-                <page location="EditRegionalNews" module="intranet" script="EditRegionalNews"
-                        allowCookies="True" />
-                <page location="ShowRegionalNews" module="intranet" script="ShowRegionalNews"
-                        allowCookies="True" />
-                <page location="EditManual" module="intranet" script="EditManual"
-                        allowCookies="True" />
-                <page location="ShowManual" module="intranet" script="ShowManual"
+                <page location="EditNationalNews" module="intranet" script="EditTextPanel"
+                        allowCookies="True" />
+                <page location="ShowNationalNews" module="intranet" script="ShowTextPanel"
+                        allowCookies="True" />
+                <page location="EditRegionalNews" module="intranet" script="EditTextPanel"
+                        allowCookies="True" />
+                <page location="ShowRegionalNews" module="intranet" script="ShowTextPanel"
+                        allowCookies="True" />
+                <page location="EditManual" module="intranet" script="EditTextPanel"
+                        allowCookies="True" />
+                <page location="ShowManual" module="intranet" script="ShowTextPanel"
                         allowCookies="True" />
 
@@ -328 +325 @@
 
         <Flow key="RequestWebChat" module="chat" script="RequestWebChat"
-                authenticationNeeded="False" domain="Public">
+                authenticationNeeded="False" domain="Public" >
                 <Task key="1" refid="GenerateSessionId" />
                 <Task key="2" refid="CheckChatOpen">
@@ -504 +501 @@
                 <AuthorizedLocation key="AddIPBlock" />
                 <AuthorizedLocation key="DeleteIPBlock" />
-                <AuthorizedLocation key="setupSite" />
-                <AuthorizedLocation key="ImportSensoor" />
         </RoleAuthorization>
 
@@ -632 +627 @@
         <Text id="EndCareSeekerChatText" value="Bedankt voor de antwoorden, je kan nu het venster sluiten" />
         <Text id="EndCareWorkerChatPanelText" value="Dit venster is offline." />
-        <Text id="organisationName" value="Sensoor"/>
+        <Text id="organisationName" value="Veilig Samen"/>
         <Text id="chatName" value="chat"/>