fixed paths for the student in workstations

Author: jredrejo

Backend/.pydevproject

@@ -5,6 +5,6 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/Backend/src</path>
+<path>/Controlaula/src</path>
 </pydev_pathproperty>
 </pydev_project>

Backend/src/ControlAula/StudentLoop.py

@@ -54,8 +54,15 @@ def render_GET(self, request):
         else:    
             requestedfile = os.path.join(self.PageDir,request.path[1:])
 
-        if pagename == "controlaula":
-            requestedfile = os.path.join(Configs.APP_DIR,'controlaula.html')                    
+        if '/controlaula/' in request.path:
+            pagename = request.path[13:]
+            if "-" in pagename:
+                request.path = request.path[12:]
+                                
+                requestedfile = os.path.join(Configs.APP_DIR,'controlaula.html')
+            else:
+                requestedfile = os.path.join(Configs.APP_DIR,pagename)
+                               
 
         if not os.path.isfile(requestedfile):
             # Didn't find it? Return an error.

Backend/src/ControlAula/TeacherMainLoop.py

@@ -57,7 +57,6 @@ def __init__ (self):
     # Return the page for a GET. This will handle requests
     # to read data.
     def render_GET(self, request):
-
         pagename = request.path[1:].lower()
         session = request.getSession()          
         if 'controlaula/' in pagename:
@@ -73,8 +72,8 @@ def render_GET(self, request):
         if  pagename == '':
             request.path='/index.html'
             pagename='index.html'
-
-        if (request.host.host!='127.0.0.1' or self.teacher_login!=session.uid) and pagename=='index.html':
+        #if (request.host.host!='127.0.0.1' or self.teacher_login!=session.uid) and pagename=='index.html':
+        if (request.host.host!='127.0.0.1' or self.teacher_login!=session.uid) and (pagename[-4:] == 'html' or pagename[-1:] == '/'):
             request.path='/student/chat.html'
             pagename='student/chat.html'
 

add-on/chrome/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "__MSG_name__",  
-  "version": "0.1",
+  "version": "0.2",
   "description": "__MSG_description__",  
   "background_page": "background.html",
   "homepage_url": "http://controlaula.sourceforge.net",