OpenMRS

src/web/org/openmrs/web/filter/initialization/InitializationFilter.java

@@ -341 +341 @@
-                        
-                        renderTemplate(page, referenceMap, writer);
-                        
-
+ f
-                else if ("adminusersetup.vm".equals(page)) {
-                        
-                        if ("Back".equals(httpRequest.getParameter("back"))) {
@@ -545 +545 @@
-                        
-                        // start openmrs
-                        try {
+                                Context.openSession();
-                                Context.startup(runtimeProperties);
-                        }
-                        catch (DatabaseUpdateException updateEx) {
@@ -565 +566 @@
-                                renderTemplate(DEFAULT_PAGE, null, writer);
-                                return;
-                        }
-
+               
-                        // TODO catch openmrs errors here and drop the user back out to the setup screen
-                        
-                        if (!wizardModel.implementationId.equals("")) {
-                                try {
-                                        Context.addProxyPrivilege(OpenmrsConstants.PRIV_MANAGE_GLOBAL_PROPERTIES);
@@ -642 +642 @@
-                        
-                        // set this so that the wizard isn't run again on next page load
-                        initializationComplete = true;
+                        Context.closeSession();
-                        
-                        // TODO send user to confirmation page with results of wizard, location of runtime props, etc instead?
-                        httpResponse.sendRedirect("/" + WebConstants.WEBAPP_NAME);