[Ils-source] r1426 - branches/1.6/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 15:27:39 -0700 (Wed, 06 Apr 2016)
New Revision: 1426

Modified:
   branches/1.6/webapp/report_employeecourseatt.jsp
Log:
fixed merge of firing course attempt update event on force pass


Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp	2016-04-06 19:31:39 UTC (rev 1425)
+++ branches/1.6/webapp/report_employeecourseatt.jsp	2016-04-06 22:27:39 UTC (rev 1426)
@@ -72,16 +72,17 @@
     	int cid = -1;
     	try { cid = Integer.parseInt(cidString); } catch (Exception e) {}
     	if (reason == null) reason = "";
+	CourseAttempt ca = null;
     	if (cid > -1) {
     		CourseAttempt caOrig = CourseAttempt.getCourseAttempt(ilsSession, cid);
     		if (caOrig != null) {
-    			CourseAttempt ca = (CourseAttempt)caOrig.clone();
+    			ca = (CourseAttempt)caOrig.clone();
     			ca.setCourseAttemptForcePass(reason);
     			ca.save(caOrig);
     		}
     	}
 	else {
-		CourseAttempt ca = new CourseAttempt();
+		ca = new CourseAttempt();
 		ca.defaultAll();
 		ca.setCourseAttemptCourseID(Integer.parseInt(courseIDString));
 		ca.setCourseAttemptUserProfileID(profileID);
@@ -89,7 +90,6 @@
 		ca = ca.saveNew(ilsSession);
 	}
 	if (ca != null) {
-
 		ca.sendStatusUpdateEvent(session.getServletContext());
 	}
     }