dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9195: FRED-API: added OpenSessionInViewFilter to /api-fred, this fixes BSOD when entering /api-fred/v1/...

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 06 Dec 2012 21:56:14 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 9195
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-12-07 00:55:24 +0300
message:
  FRED-API: added OpenSessionInViewFilter to /api-fred, this fixes BSOD when entering /api-fred/v1/facilities
modified:
  dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/layout.vm
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/layout.vm'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/layout.vm	2012-12-06 21:41:42 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/layout.vm	2012-12-06 21:55:24 +0000
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>FRED Facility API v1 (DHIS2)</title>
+    <title>FRED Facility API v1.0 (DHIS2)</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <script src="$baseUrl/dhis-web-commons/javascripts/jQuery/jquery.min.js?v=1.8.2"></script>
@@ -33,7 +33,7 @@
                 <span class="icon-bar"></span>
             </a>
 
-            <a class="brand" href="#">FRED Facility API v1</a>
+            <a class="brand" href="#">FRED Facility API v1.0</a>
 
             <div class="nav-collapse collapse">
                 <ul class="nav">

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml	2012-12-06 20:06:23 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml	2012-12-06 21:55:24 +0000
@@ -67,6 +67,10 @@
   </filter-mapping>
   <filter-mapping>
     <filter-name>OpenSessionInViewFilter</filter-name>
+    <url-pattern>/api-fred/*</url-pattern>
+  </filter-mapping>
+  <filter-mapping>
+    <filter-name>OpenSessionInViewFilter</filter-name>
     <url-pattern>/mobile/*</url-pattern>
   </filter-mapping>
   <filter-mapping>