[Ils-source] r1278 - in branches/1.6: . db src webapp
scribe at crosswire.org
scribe at crosswire.org
Thu Dec 4 07:42:55 MST 2014
Author: scribe
Date: 2014-12-04 07:42:55 -0700 (Thu, 04 Dec 2014)
New Revision: 1278
Modified:
branches/1.6/
branches/1.6/db/
branches/1.6/src/
branches/1.6/webapp/
branches/1.6/webapp/admin_profile.jsp
branches/1.6/webapp/admin_systemmanagement.jsp
Log:
applied feature from trunk allowing switch to enable user editing of their email address
Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:796-803,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251
+ /trunk:796-803,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276
Property changes on: branches/1.6/db
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/db:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251
+ /trunk/db:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276
Property changes on: branches/1.6/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251
+ /trunk/src:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276
Property changes on: branches/1.6/webapp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/webapp:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251
+ /trunk/webapp:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276
Modified: branches/1.6/webapp/admin_profile.jsp
===================================================================
--- branches/1.6/webapp/admin_profile.jsp 2014-12-04 14:28:44 UTC (rev 1277)
+++ branches/1.6/webapp/admin_profile.jsp 2014-12-04 14:42:55 UTC (rev 1278)
@@ -310,6 +310,7 @@
String returnPage = (user.getUserProfileAccessLevel() > UserProfile.ACCESS_MANAGER) ? "admin_profilemanagement.jsp" : (user.getUserProfileAccessLevel() < UserProfile.ACCESS_EMPLOYEE) ? "" : "employee.jsp";
boolean editMisc = ((user.getUserProfileAccessLevel() > UserProfile.ACCESS_MANAGER) || (current.getUserProfileID() < 1) || (user.hasAccess(UserProfile.ACCESS_MODE_USERPR_MODIFY_USER)));
+ boolean userEditEmail = "on".equals(Utils.getSysConfig(session).getProperty("EmailEnableUserEdit", "off"));
%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -610,7 +611,7 @@
</tr>
<tr>
<td height="23" class="formHeadings">Email: </td>
- <td colspan="2"><input name="eMail" type="text" value="<%=current.getUserProfileEMail()%>" size="45" <%=(editMisc)?"":"disabled=\"true\""%> /> </td>
+ <td colspan="2"><input name="eMail" type="text" value="<%=current.getUserProfileEMail()%>" size="45" <%=(editMisc || userEditEmail)?"":"disabled=\"true\""%> /> </td>
</tr>
<tr>
<td class="formHeadings">Phone:</td>
Modified: branches/1.6/webapp/admin_systemmanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_systemmanagement.jsp 2014-12-04 14:28:44 UTC (rev 1277)
+++ branches/1.6/webapp/admin_systemmanagement.jsp 2014-12-04 14:42:55 UTC (rev 1278)
@@ -135,6 +135,7 @@
String currentEmailEnableChangePassword = sysConfigProperties.getProperty("EmailEnableChangePassword", "");
String currentEmailEnableStudentPassFail = sysConfigProperties.getProperty("EmailEnableStudentPassFail", "");
String currentEmailEnableManagerSummaryReport = sysConfigProperties.getProperty("EmailEnableManagerSummaryReport", "");
+ String currentEmailEnableUserEdit = sysConfigProperties.getProperty("EmailEnableUserEdit", "");
String currentAPIEnable = sysConfigProperties.getProperty("APIEnable", "");
String currentAPICallbackCourseComplete = sysConfigProperties.getProperty("APICallbackCourseComplete", "");
String currentSREnable = sysConfigProperties.getProperty("SREnable", "");
@@ -194,6 +195,7 @@
String emailEnableRecoverPassUser = request.getParameter("emailEnableRecoverPassUser");
String emailEnableAssignedRetakes = request.getParameter("emailEnableAssignedRetakes");
String emailEnableChangePassword = request.getParameter("emailEnableChangePassword");
+ String emailEnableUserEdit = request.getParameter("emailEnableChangeUserEdit");
String emailEnableStudentPassFail = request.getParameter("emailEnableStudentPassFail");
String emailEnableManagerSummaryReport = request.getParameter("emailEnableManagerSummaryReport");
String emailEnableBeforeDue = request.getParameter("emailEnableBeforeDue");
@@ -293,6 +295,9 @@
if ("emailEnableChangePassword".equals(fi.getFieldName())) {
emailEnableChangePassword = fi.getString();
}
+ if ("emailEnableUserEdit".equals(fi.getFieldName())) {
+ emailEnableUserEdit = fi.getString();
+ }
if ("emailEnableStudentPassFail".equals(fi.getFieldName())) {
emailEnableStudentPassFail = fi.getString();
}
@@ -626,6 +631,12 @@
sysConfigProperties.setProperty("EmailEnableChangePassword", emailEnableChangePassword);
currentEmailEnableChangePassword = emailEnableChangePassword;
}
+ if (emailEnableUserEdit == null) { emailEnableUserEdit = "off"; }
+ if (!emailEnableUserEdit.equals(currentEmailEnableUserEdit)) {
+ saveSysconfig = true;
+ sysConfigProperties.setProperty("EmailEnableUserEdit", emailEnableUserEdit);
+ currentEmailEnableUserEdit = emailEnableUserEdit;
+ }
if (emailEnableStudentPassFail == null) { emailEnableStudentPassFail = "off"; }
if (!emailEnableStudentPassFail.equals(currentEmailEnableStudentPassFail)) {
saveSysconfig = true;
@@ -1047,9 +1058,17 @@
<td colspan="2"> </td>
</tr>
<tr>
+ <td>Allow Users To Edit Their Email Address</td>
+ <td colspan="2"><input name="emailEnableUserEdit" type="checkbox" value="on" <%="on".equals(currentEmailEnableUserEdit)?"checked=\"checked\"":""%> size="40"/></td>
+ </tr>
+ <tr>
<td> </td>
<td colspan="2"> </td>
</tr>
+ <tr>
+ <td> </td>
+ <td colspan="2"> </td>
+ </tr>
More information about the Ils-source
mailing list