Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.52.2.4.2.10 -r1.52.2.4.2.11
--- lams_admin/conf/language/lams/ApplicationResources.properties 16 Apr 2010 06:15:26 -0000 1.52.2.4.2.10
+++ lams_admin/conf/language/lams/ApplicationResources.properties 25 May 2010 20:23:56 -0000 1.52.2.4.2.11
@@ -453,6 +453,6 @@
admin.timezone.display.name =Display name
admin.user.enable.flash.for.learner.window =Enable Flash for Learner Window
admin.user.time.zone =Time Zone
+config.show.all.my.lesson.link =Show All My Lesson link
-
#======= End labels: Exported 447 labels for en AU =====
Index: lams_central/web/profile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/profile.jsp,v
diff -u -r1.19 -r1.19.10.1
--- lams_central/web/profile.jsp 28 Nov 2007 01:30:22 -0000 1.19
+++ lams_central/web/profile.jsp 25 May 2010 20:24:04 -0000 1.19.10.1
@@ -5,7 +5,11 @@
<%@ taglib uri="tags-fmt" prefix="fmt"%>
<%@ taglib uri="tags-logic" prefix="logic"%>
<%@ taglib uri="tags-core" prefix="c"%>
-<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" %>
+<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
+ import="org.lamsfoundation.lams.util.Configuration"
+ import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+
+<%=Configuration.get(ConfigurationKeys.SHOW_ALL_MY_LESSON_LINK)%>
@@ -47,9 +51,11 @@
href="index.do?state=active&tab=portrait">
-
+
+
+
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.43.2.4.2.2 -r1.43.2.4.2.3
--- lams_common/db/sql/insert_lams_unix_config_data.sql 10 Feb 2010 03:30:10 -0000 1.43.2.4.2.2
+++ lams_common/db/sql/insert_lams_unix_config_data.sql 25 May 2010 20:24:01 -0000 1.43.2.4.2.3
@@ -101,6 +101,9 @@
values ('AllowLiveEdit','true', 'config.allow.live.edit', 'config.header.features', 'BOOLEAN', 1);
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('ShowAllMyLessonLink','true', 'config.show.all.my.lesson.link', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v
diff -u -r1.35.4.4.2.2 -r1.35.4.4.2.3
--- lams_common/db/sql/insert_lams_windows_config_data.sql 10 Feb 2010 03:30:10 -0000 1.35.4.4.2.2
+++ lams_common/db/sql/insert_lams_windows_config_data.sql 25 May 2010 20:24:01 -0000 1.35.4.4.2.3
@@ -101,6 +101,9 @@
values ('AllowLiveEdit','true', 'config.allow.live.edit', 'config.header.features', 'BOOLEAN', 1);
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('ShowAllMyLessonLink','true', 'config.show.all.my.lesson.link', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030500.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch02030500.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030500.sql 12 Apr 2010 06:46:34 -0000 1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030500.sql 25 May 2010 20:24:01 -0000 1.1.2.2
@@ -96,13 +96,14 @@
DELETE FROM lams_log_event_type;
INSERT INTO lams_log_event_type VALUES (1, 'TYPE_TEACHER_LEARNING_DESIGN_CREATE');
INSERT INTO lams_log_event_type VALUES (2, 'TYPE_TEACHER_LESSON_CREATE');
-INSERT INTO lams_log_event_type VALUES (3, 'TYPE_LEARNER_LESSON_START');
-INSERT INTO lams_log_event_type VALUES (4, 'TYPE_LEARNER_LESSON_FINISH');
-INSERT INTO lams_log_event_type VALUES (5, 'TYPE_LEARNER_LESSON_EXIT');
-INSERT INTO lams_log_event_type VALUES (6, 'TYPE_LEARNER_LESSON_RESUME');
-INSERT INTO lams_log_event_type VALUES (7, 'TYPE_LEARNER_ACTIVITY_START');
-INSERT INTO lams_log_event_type VALUES (8, 'TYPE_LEARNER_ACTIVITY_FINISH');
-INSERT INTO lams_log_event_type VALUES (9, 'TYPE_LEARNER_ADDED_TO_GROUP');
+INSERT INTO lams_log_event_type VALUES (3, 'TYPE_TEACHER_LESSON_START');
+INSERT INTO lams_log_event_type VALUES (4, 'TYPE_TEACHER_LESSON_CHANGE_STATE');
+INSERT INTO lams_log_event_type VALUES (5, 'TYPE_LEARNER_ACTIVITY_START');
+INSERT INTO lams_log_event_type VALUES (6, 'TYPE_LEARNER_ACTIVITY_FINISH');
+-- LDEV-2564 Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('ShowAllMyLessonLink','true', 'config.show.all.my.lesson.link', 'config.header.features', 'BOOLEAN', 1);
+
COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.40 -r1.40.8.1
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 19 Feb 2009 05:36:30 -0000 1.40
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 25 May 2010 20:24:01 -0000 1.40.8.1
@@ -138,6 +138,8 @@
public static String LAMS_COMMUNITY_ENABLE = "LAMS_Community_enable";
public static String ALLOW_EDIT_ON_FLY = "AllowLiveEdit";
+
+ public static String SHOW_ALL_MY_LESSON_LINK = "ShowAllMyLessonLink";
public static String LDAP_PROVISIONING_ENABLED = "LDAPProvisioningEnabled";