Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java =================================================================== diff -u -raf7bc7f9e66df064739240f751ba03ffdc74795f -re1d015f6bac58b1ca469873e3cb90a9c8049528f --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision af7bc7f9e66df064739240f751ba03ffdc74795f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision e1d015f6bac58b1ca469873e3cb90a9c8049528f) @@ -45,8 +45,10 @@ public static final String AUTHOR = "AUTHOR"; - public static final String TEACHER = "TEACHER"; + public static final String COURSE_MANAGER = "COURSE MANAGER"; + public static final String COURSE_ADMIN = "COURSE ADMIN"; + public static final String SYSADMIN = "SYSADMIN";//for future use /** @@ -59,11 +61,11 @@ * ************************************************************/ public static final Integer ROLE_SYSADMIN =new Integer(1); - public static final Integer ROLE_ADMIN =new Integer(2); + public static final Integer ROLE_COURSE_MANAGER =new Integer(2); public static final Integer ROLE_AUTHOR =new Integer(3); public static final Integer ROLE_STAFF =new Integer(4); public static final Integer ROLE_LEARNER =new Integer(5); - public static final Integer ROLE_TEACHER =new Integer(6); + public static final Integer ROLE_COURSE_ADMIN =new Integer(6); /***********************************************************/ /** identifier field */ @@ -205,13 +207,21 @@ .toHashCode(); } public boolean isAuthor(){ - return this.roleId.equals(ROLE_AUTHOR)?true:false; + return this.roleId.equals(ROLE_AUTHOR); } - public boolean isTeacher(){ - return this.roleId.equals(ROLE_TEACHER)?true:false; + public boolean isCourseManager(){ + return this.roleId.equals(ROLE_COURSE_MANAGER); } + + public boolean isCourseAdmin(){ + return this.roleId.equals(ROLE_COURSE_ADMIN); + } + public boolean isStaff(){ - return this.roleId.equals(ROLE_STAFF)?true:false ; + return this.roleId.equals(ROLE_STAFF); } + public boolean isSysAdmin(){ + return this.roleId.equals(ROLE_SYSADMIN); + } }