Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v
diff -u -r1.27.4.3 -r1.27.4.3.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 19 Jun 2009 04:32:09 -0000 1.27.4.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 25 Feb 2010 18:32:46 -0000 1.27.4.3.2.1
@@ -544,6 +544,29 @@
+
+
+
+
+
+
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.138.2.6 -r1.138.2.6.2.1
--- lams_common/db/sql/create_lams_11_tables.sql 19 Jun 2009 04:32:09 -0000 1.138.2.6
+++ lams_common/db/sql/create_lams_11_tables.sql 25 Feb 2010 18:34:38 -0000 1.138.2.6.2.1
@@ -1135,3 +1135,15 @@
, PRIMARY KEY (uid)
)TYPE=InnoDB;
+CREATE TABLE lams_planner_recent_learning_designs (
+ user_id BIGINT(20) NOT NULL
+ , learning_design_id BIGINT(20) NOT NULL
+ , last_modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+ , CONSTRAINT FK_lams_planner_recent_learning_designs_1 FOREIGN KEY (user_id)
+ REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT FK_lams_planner_recent_learning_designs_2 FOREIGN KEY (learning_design_id)
+ REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , PRIMARY KEY (user_id,learning_design_id)
+)TYPE=InnoDB;
+
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/db/sql/updatescripts/alter_234_planner_recent_lds.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.36.4.5 -r1.36.4.5.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 19 Jun 2009 04:32:09 -0000 1.36.4.5
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 25 Feb 2010 18:32:46 -0000 1.36.4.5.2.1
@@ -28,6 +28,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TimeZone;
@@ -161,6 +162,9 @@
/** persistent field */
private String lamsCommunityUsername;
+
+ /** persistent field - for Pedagogical Planner */
+ private Set recentlyModifiedLearningDesigns = new LinkedHashSet();
// ------- TIMEZONES (hardcoded, there is no need to put them into database --------------
@@ -847,5 +851,19 @@
this.timeZone = timeZone;
}
+
+ /**
+ * @hibernate.set lazy="true" table="lams_planner_recent_learning_designs" cascade="all"
+ * order-by="last_modified_date DESC"
+ * @hibernate.collection-key column="user_id"
+ * @hibernate.collection-element column="learning_design_id" type="long" not-null="true"
+ */
+ public Set getRecentlyModifiedLearningDesigns() {
+ return recentlyModifiedLearningDesigns;
+ }
+ public void setRecentlyModifiedLearningDesigns(Set recentlyModifiedLearningDesigns) {
+ this.recentlyModifiedLearningDesigns = recentlyModifiedLearningDesigns;
+ }
+
}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v
diff -u -r1.60 -r1.60.6.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 24 Mar 2009 04:18:05 -0000 1.60
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 25 Feb 2010 18:32:46 -0000 1.60.6.1
@@ -381,6 +381,12 @@
public boolean isUserSysAdmin();
/**
+ * Return true if user is a global author admin.
+ * @return
+ */
+ public boolean isUserGlobalAuthorAdmin();
+
+ /**
* Count the number of unique (distinct) users with a particular role in the system.
* @param roleId Role ID
* @return
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.102.6.1 -r1.102.6.2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 21 Oct 2009 00:12:40 -0000 1.102.6.1
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 25 Feb 2010 18:32:46 -0000 1.102.6.2
@@ -1006,6 +1006,12 @@
Integer requestorId = getRequestorId();
return (requestorId != null ? isUserInRole(requestorId, rootOrgId, Role.SYSADMIN) : false);
}
+
+ public boolean isUserGlobalAuthorAdmin() {
+ Integer rootOrgId = getRootOrganisation().getOrganisationId();
+ Integer requestorId = getRequestorId();
+ return requestorId != null ? isUserInRole(requestorId, rootOrgId, Role.AUTHOR_ADMIN) : false;
+ }
public Integer getCountRoleForSystem(Integer roleId) {
Integer count = roleDAO.getCountRoleForSystem(roleId);
@@ -1196,4 +1202,5 @@
deleteAll(uos);
return uos.size();
}
+
}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v
diff -u -r1.28.2.2 -r1.28.2.2.2.1
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 19 Jun 2009 04:32:09 -0000 1.28.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 25 Feb 2010 18:32:46 -0000 1.28.2.2.2.1
@@ -88,4 +88,5 @@
public static final String COMMAND_GET_EDITING_ADVICE = "getEditingAdvice";
public static final String COMMAND_CHECK_EDITING_ADVICE = "checkEditingAdvice";
public static final String PARAM_ACTIVITY_INDEX = "activityIndex";
+
}