Skip to content

Commit a6e5a85

Browse files
jesusmmpjesusmmp
committed
SAK-49440 Modify the default behaviour of the 'mark as read' in the forums tool.
1 parent fb2764f commit a6e5a85

File tree

40 files changed

+244
-232
lines changed

40 files changed

+244
-232
lines changed

Diff for: ‎lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/ForumEntity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ private void setMasks() {
495495
noneMask.put(PermissionLevel.CHANGE_SETTINGS,Boolean.valueOf(false));
496496
noneMask.put(PermissionLevel.POST_TO_GRADEBOOK, Boolean.valueOf(false));
497497
noneMask.put(PermissionLevel.READ, Boolean.valueOf(false));
498-
noneMask.put(PermissionLevel.MARK_AS_READ,Boolean.valueOf(false));
498+
noneMask.put(PermissionLevel.MARK_AS_NOT_READ,Boolean.valueOf(true));
499499
noneMask.put(PermissionLevel.MODERATE_POSTINGS, Boolean.valueOf(false));
500500
noneMask.put(PermissionLevel.IDENTIFY_ANON_AUTHORS, Boolean.valueOf(false));
501501
noneMask.put(PermissionLevel.DELETE_OWN, Boolean.valueOf(false));
@@ -513,7 +513,7 @@ private void setMasks() {
513513
contributorMask.put(PermissionLevel.CHANGE_SETTINGS,Boolean.valueOf(false));
514514
contributorMask.put(PermissionLevel.POST_TO_GRADEBOOK, Boolean.valueOf(false));
515515
contributorMask.put(PermissionLevel.READ, Boolean.valueOf(true));
516-
contributorMask.put(PermissionLevel.MARK_AS_READ,Boolean.valueOf(true));
516+
contributorMask.put(PermissionLevel.MARK_AS_NOT_READ,Boolean.valueOf(false));
517517
contributorMask.put(PermissionLevel.MODERATE_POSTINGS, Boolean.valueOf(false));
518518
contributorMask.put(PermissionLevel.IDENTIFY_ANON_AUTHORS, Boolean.valueOf(false));
519519
contributorMask.put(PermissionLevel.DELETE_OWN, Boolean.valueOf(false));
@@ -531,7 +531,7 @@ private void setMasks() {
531531
ownerMask.put(PermissionLevel.CHANGE_SETTINGS,Boolean.valueOf(true));
532532
ownerMask.put(PermissionLevel.POST_TO_GRADEBOOK, Boolean.valueOf(true));
533533
ownerMask.put(PermissionLevel.READ, Boolean.valueOf(true));
534-
ownerMask.put(PermissionLevel.MARK_AS_READ,Boolean.valueOf(true));
534+
ownerMask.put(PermissionLevel.MARK_AS_NOT_READ,Boolean.valueOf(false));
535535
ownerMask.put(PermissionLevel.MODERATE_POSTINGS, Boolean.valueOf(true));
536536
ownerMask.put(PermissionLevel.IDENTIFY_ANON_AUTHORS, Boolean.valueOf(false));
537537
ownerMask.put(PermissionLevel.DELETE_OWN, Boolean.valueOf(false));

Diff for: ‎msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ cdfm_toolbar_separator = |
5656
cdfm_moderator_comment_text = Comment By
5757
cdfm_moderator_comment_text_anon = Comment By Moderator
5858
cdfm_moderate = Moderate
59-
cdfm_mark_as_read=Mark as Read
59+
cdfm_mark_as_not_read=Mark as Not Read
6060
cdfm_readby= - Read by:
6161
stat_list = Statistics & Grading
6262
stat_list_student = Statistics
@@ -183,7 +183,7 @@ cdfm_mark_check_as_read=Mark Read
183183
cdfm_mark_check_as_unread=Mark Unread
184184
cdfm_mark_check_as_delete=Delete
185185
cdfm_mark_check_move_to_folder=Move
186-
cdfm_mark_all_as_read=Mark All as Read
186+
cdfm_mark_all_as_not_read=Mark All as Not Read
187187
cdfm_reply=Reply
188188
cdfm_print=Print
189189
cdfm_printer_friendly=Printer Friendly Format
@@ -303,7 +303,7 @@ cdfm_failed_create_topic=Failed to create new topic
303303
cdfm_failed_rend_message=Failed Rending Messages
304304
cdfm_view_under_construct=This view is under contruction
305305
cdfm_lost_association=Lost association with current topic
306-
cdfm_no_message_mark_read=No message selected to mark as read. Please select a message.
306+
cdfm_no_message_mark_no_read=No message selected to mark as not read. Please select a message.
307307
cdfm_grade_successful=Grade submission successful.
308308
cdfm_grade_greater_than_zero=Please input a number greater than or equal to 0.
309309
cdfm_grade_decimal_warn=Please input number with 2 or fewer digits after decimal point.
@@ -413,7 +413,7 @@ perm_revise_any=Edit Any
413413
perm_revise_own=Edit Own
414414
perm_delete_any=Delete Any
415415
perm_delete_own=Delete Own
416-
perm_mark_as_read=Mark as Read
416+
perm_mark_as_not_read=Mark as Not Read
417417
perm_choose_assignment_head=Grading
418418
perm_choose_assignment=Gradebook item:
419419
perm_choose_assignment_none_f=You can associate a grade from the Gradebook to this forum, but there are no existing Gradebook items.
@@ -655,7 +655,7 @@ pvt_missing_body = You must write your message before you can send it.
655655
pvt_missing_body_draft =You must write your message before you can save it.
656656
pvt_confirm_msg_delete = Are you sure you want to delete this message? If yes, click Delete to delete the message.
657657
pvt_enter_search_text = Please enter text for search.
658-
pvt_no_message_mark_read=No message selected to mark as read. Please select a message.
658+
pvt_no_message_mark_no_read=No message selected to mark as not read. Please select a message.
659659
pvt_no_message_mark_delete=No message selected for deletion. Please select a message.
660660
pvt_no_message_mark_move=No message selected to move to another folder. Please select a message.
661661
pvt_deleted_success=The message(s) you selected have been successfully moved to the Deleted folder.
@@ -698,7 +698,7 @@ pvt_scheduler_send= Schedule when this message will be sent
698698
pvt_scheduler_send_as_email= Schedule the message to be sent at the selected date and time
699699
pvt_scheduler_send_date= Date:
700700
syn_anon=No unread message counts as you aren't logged in.
701-
syn_mark_as_read=Mark all as read
701+
syn_mark_as_not_read=Mark all as not read
702702
syn_site_heading=Site
703703
syn_private_heading=New Messages
704704
syn_discussion_heading=New in Discussions

Diff for: ‎msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ cdfm_toolbar_separator=|
5656
cdfm_moderator_comment_text=Comentario de
5757
cdfm_moderator_comment_text_anon=Comentario del moderador
5858
cdfm_moderate=Moderar
59-
cdfm_mark_as_read=Marcar como le\u00eddo
59+
cdfm_mark_as_not_read=Marcar como no le\u00eddo
6060
cdfm_readby=- Le\u00eddo por\:
6161
stat_list=Estad\u00edsticas y calificaci\u00f3n
6262
stat_list_student=Estad\u00edsticas
@@ -183,7 +183,7 @@ cdfm_mark_check_as_read=Marcar le\u00eddos
183183
cdfm_mark_check_as_unread=Marcar no le\u00eddos
184184
cdfm_mark_check_as_delete=Eliminar
185185
cdfm_mark_check_move_to_folder=Mover
186-
cdfm_mark_all_as_read=Marcar todos como le\u00eddos
186+
cdfm_mark_all_as_not_read=Marcar todos como no le\u00eddos
187187
cdfm_reply=Responder
188188
cdfm_print=Imprimir
189189
cdfm_printer_friendly=Versi\u00f3n imprimible
@@ -409,7 +409,7 @@ perm_revise_any=Editar cualquiera
409409
perm_revise_own=Editar propios
410410
perm_delete_any=Eliminar cualquiera
411411
perm_delete_own=Eliminar propios
412-
perm_mark_as_read=Marcar como le\u00eddo
412+
perm_mark_as_read=Marcar como no le\u00eddo
413413
perm_choose_assignment_head=Calificaci\u00f3n
414414
perm_choose_assignment=\u00cdtem de calificaci\u00f3n\:
415415
perm_choose_assignment_none_f=Puede asociar un \u00edtem de Calificaciones con este foro, sin embargo, no hay todav\u00eda \u00edtems creados.
@@ -651,7 +651,7 @@ pvt_missing_body=Debe escribir el mensaje antes de enviarlo.
651651
pvt_missing_body_draft=Debe escribir el mensaje antes de guardarlo.
652652
pvt_confirm_msg_delete=\u00bfEst\u00e1 seguro que desea eliminar este mensaje? En caso afirmativo, haga clic en Eliminar para eliminar el mensaje.
653653
pvt_enter_search_text=Introduzca el texto de b\u00fasqueda.
654-
pvt_no_message_mark_read=No se ha seleccionado ning\u00fan mensaje para marcarlo como le\u00eddo. Seleccione un mensaje.
654+
pvt_no_message_mark_no_read=No se ha seleccionado ning\u00fan mensaje para marcarlo como no le\u00eddo. Seleccione un mensaje.
655655
pvt_no_message_mark_delete=No hay mensajes seleccionados para eliminar. Seleccione un mensaje.
656656
pvt_no_message_mark_move=No hay mensajes seleccionados para mover a otra carpeta. Seleccione un mensaje.
657657
pvt_deleted_success=Los mensajes seleccionados se han movido correctamente a la carpeta de mensajes Eliminados.
@@ -694,7 +694,7 @@ pvt_scheduler_send=Programar env\u00edo
694694
pvt_scheduler_send_as_email=Programar el env\u00edo del mensaje en la fecha y hora seleccionada
695695
pvt_scheduler_send_date=Fecha\:
696696
syn_anon=Si no hay mensajes sin leer, se considera que no est\u00e1 conectado.
697-
syn_mark_as_read=Marcar todos como le\u00eddos
697+
syn_mark_as_not_read=Marcar todos como no le\u00eddos
698698
syn_site_heading=Sitio
699699
syn_private_heading=Mensajes nuevos
700700
syn_discussion_heading=Nuevos mensajes en foros

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/BulkPermission.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class BulkPermission {
2323
private boolean changeSettings;
2424
private boolean deleteAny;
2525
private boolean deleteOwn;
26-
private boolean markAsRead;
26+
private boolean markAsNotRead;
2727
private boolean moderatePostings;
2828
private boolean movePostings;
2929
private boolean newResponse;
@@ -35,7 +35,7 @@ public class BulkPermission {
3535
private boolean reviseOwn;
3636

3737
public void setAllPermissions(boolean toTrueOrFalse) {
38-
changeSettings = deleteAny = deleteOwn = markAsRead = moderatePostings = movePostings = newTopic
38+
changeSettings = deleteAny = deleteOwn = markAsNotRead = moderatePostings = movePostings = newTopic
3939
= newResponse = newResponseToResponse = postToGradebook = read = reviseAny = reviseOwn
4040
= toTrueOrFalse;
4141
}

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/DefaultPermissionsManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public interface DefaultPermissionsManager
3939
public static final String FUNCTION_REVISE_OWN="messagecenter.reviseOwn";
4040
public static final String FUNCTION_DELETE_ANY="messagecenter.deleteAny";
4141
public static final String FUNCTION_DELETE_OWN="messagecenter.deleteOwn";
42-
public static final String FUNCTION_MARK_AS_READ="messagecenter.markAsRead";
42+
public static final String FUNCTION_MARK_AS_NOT_READ="messagecenter.markAsNotRead";
4343

4444
public static final String MESSAGE_FUNCTION_PREFIX="msg.";
4545
public static final String MESSAGE_FUNCTION_EMAIL= MESSAGE_FUNCTION_PREFIX +"emailout";
@@ -83,6 +83,6 @@ public interface DefaultPermissionsManager
8383

8484
public boolean isDeleteOwn(String role);
8585

86-
public boolean isMarkAsRead(String role);
86+
public boolean isMarkAsNotRead(String role);
8787

8888
}

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessageForumsMessageManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ String saveMessage(Message message, boolean logEvent, String toolId, String user
9898

9999
public void markMessageApproval(Long messageId, boolean approved);
100100

101-
public void markMessageReadForUser(Long topicId, Long messageId, boolean read);
101+
public void markMessageNotReadForUser(Long topicId, Long messageId, boolean read);
102102

103-
public void markMessageReadForUser(Long topicId, Long messageId, boolean read, String userId);
103+
public void markMessageNotReadForUser(Long topicId, Long messageId, boolean read, String userId);
104104

105-
public void markMessageReadForUser(Long topicId, Long messageId, boolean read, String userId, String context, String toolId);
105+
public void markMessageNotReadForUser(Long topicId, Long messageId, boolean read, String userId, String context, String toolId);
106106

107-
public boolean isMessageReadForUser(Long topicId, Long messageId);
107+
public boolean isMessageNotReadForUser(Long topicId, Long messageId);
108108

109109
public UnreadStatus findUnreadStatus(Long topicId, Long messageId);
110110

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/MessagePermissions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ public interface MessagePermissions {
5252

5353
public Boolean getReviseOwn();
5454

55-
public Boolean getMarkAsRead();
55+
public Boolean getMarkAsNotRead();
5656

57-
public void setMarkAsRead(Boolean markAsRead);
57+
public void setMarkAsNotRead(Boolean markAsNotRead);
5858

5959
public void setReviseOwn(Boolean reviseOwn);
6060

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/PermissionLevel.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface PermissionLevel extends MutableEntity{
3030
public static final String CHANGE_SETTINGS = "changeSettings";
3131
public static final String POST_TO_GRADEBOOK = "postToGradebook";
3232
public static final String READ = "read";
33-
public static final String MARK_AS_READ = "markAsRead";
33+
public static final String MARK_AS_NOT_READ = "markAsNotRead";
3434
public static final String MODERATE_POSTINGS = "moderatePostings";
3535
public static final String IDENTIFY_ANON_AUTHORS = "identifyAnonAuthors";
3636
public static final String DELETE_OWN = "deleteOwn";
@@ -58,9 +58,9 @@ public interface PermissionLevel extends MutableEntity{
5858

5959
public void setDeleteOwn(Boolean deleteOwn);
6060

61-
public Boolean getMarkAsRead();
61+
public Boolean getMarkAsNotRead();
6262

63-
public void setMarkAsRead(Boolean markAsRead);
63+
public void setMarkAsNotRead(Boolean markAsNotRead);
6464

6565
public Boolean getModeratePostings();
6666

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/DiscussionForumManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -439,12 +439,12 @@ public void saveTopicMessagePermissions(DiscussionTopic topic,
439439
public void markMessageAs(Message message, boolean readStatus);
440440

441441
/**
442-
* Mark the read status for a given message for a given user
442+
* Mark the not read status for a given message for a given user
443443
* @param message
444444
* @param readStatus
445445
* @param userId
446446
*/
447-
public void markMessageReadStatusForUser(Message message, boolean readStatus, String userId);
447+
public void markMessageNotReadStatusForUser(Message message, boolean readStatus, String userId);
448448

449449

450450
/**

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/PrivateMessageManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public interface PrivateMessageManager {
6969

7070
public void saveForumSettings(PrivateForum forum);
7171

72-
public void markMessageAsReadForUser(final PrivateMessage message);
73-
public void markMessageAsReadForUser(final PrivateMessage message, final String contextId);
74-
public void markMessageAsReadForUser(final PrivateMessage message, final String contextId, final String userId, String toolId);
72+
public void markMessageAsNotReadForUser(final PrivateMessage message);
73+
public void markMessageAsNotReadForUser(final PrivateMessage message, final String contextId);
74+
public void markMessageAsNotReadForUser(final PrivateMessage message, final String contextId, final String userId, String toolId);
7575

7676
public void markMessageAsUnreadForUser(final PrivateMessage message);
7777
public void markMessageAsUnreadForUser(final PrivateMessage message, final String contextId);

Diff for: ‎msgcntr/messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/UIPermissionsManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public interface UIPermissionsManager
190190
* @param topic
191191
* @return
192192
*/
193-
public boolean isMarkAsRead(DiscussionTopic topic, DiscussionForum forum);
193+
public boolean isMarkAsNotRead(DiscussionTopic topic, DiscussionForum forum);
194194

195195
/**
196196
* Returns whether current user has perm to moderate in this situation

0 commit comments

Comments
 (0)