You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/06 07:22:51 UTC
svn commit: r1510857 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
persistence/beans/user/PrivateMessage.java
web/user/profile/MessagesContactsPanel.java
web/user/profile/SettingsPanel.java
Author: solomax
Date: Tue Aug 6 05:22:50 2013
New Revision: 1510857
URL: http://svn.apache.org/r1510857
Log:
[OPENMEETINGS-615] minor display issues are fixed
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/SettingsPanel.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java?rev=1510857&r1=1510856&r2=1510857&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java Tue Aug 6 05:22:50 2013
@@ -50,7 +50,7 @@ import org.simpleframework.xml.Root;
"AND c.isTrash = :isTrash " +
"AND c.owner.user_id = :toUserId " +
"AND (:isRead IS NULL OR c.isRead = :isRead) " +
- "AND (:folderId IS NULL OR c.privateMessageFolderId = :folderId) "),
+ "AND ((:folderId IS NULL AND c.privateMessageFolderId IS NULL) OR c.privateMessageFolderId = :folderId) "),
@NamedQuery(name = "updatePrivateMessagesToTrash", query = "UPDATE PrivateMessage c " +
"SET c.isTrash = :isTrash,c.privateMessageFolderId = :privateMessageFolderId " +
"where c.privateMessageId IN (:privateMessageIds) "),
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1510857&r1=1510856&r2=1510857&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Tue Aug 6 05:22:50 2013
@@ -196,8 +196,6 @@ public class MessagesContactsPanel exten
deleteBtn.add(AttributeModifier.replace("value", WebSession.getString(TRASH_FOLDER_ID == id ? 1256 : 1245)));
readBtn.setEnabled(false);
unreadBtn.setEnabled(false);
- //FIXME it is not working! (at least for the SENT folder)
- unread.setDefaultModelObject(getBean(PrivateMessagesDao.class).count(getUserId(), id > 0 ? id : null, false, TRASH_FOLDER_ID == id));
if (target != null) {
updateTable(target);
target.add(folders, unread, selectDropDown, moveDropDown);
@@ -209,6 +207,8 @@ public class MessagesContactsPanel exten
private void emptySelection(AjaxRequestTarget target) {
selectedMessages.clear();
selectMessage(-1, target);
+ long id = selectedModel.getObject();
+ unread.setDefaultModelObject(getBean(PrivateMessagesDao.class).count(getUserId(), id > 0 ? id : null, false, TRASH_FOLDER_ID == id));
}
private String getDisplayName(User u) {
@@ -407,7 +407,7 @@ public class MessagesContactsPanel exten
target.add(container);
}
});
- StringBuilder cssClass = new StringBuilder(Boolean.TRUE.equals(m.getIsRead()) ? "unread" : "");
+ StringBuilder cssClass = new StringBuilder(Boolean.FALSE.equals(m.getIsRead()) ? "unread" : "");
if (selectedMessages.contains(id)) {
if (cssClass.length() > 0) {
cssClass.append(" ");
@@ -468,9 +468,9 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget target) {
- getBean(PrivateMessagesDao.class).updatePrivateMessagesReadStatus(selectedMessages, false);
+ getBean(PrivateMessagesDao.class).updatePrivateMessagesReadStatus(selectedMessages, true);
emptySelection(target);
- target.add(container);
+ target.add(container, unread);
}
}));
buttons.add(unreadBtn.add(new AjaxEventBehavior("click") {
@@ -478,7 +478,7 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget target) {
- getBean(PrivateMessagesDao.class).updatePrivateMessagesReadStatus(selectedMessages, true);
+ getBean(PrivateMessagesDao.class).updatePrivateMessagesReadStatus(selectedMessages, false);
emptySelection(target);
target.add(container);
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/SettingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/SettingsPanel.java?rev=1510857&r1=1510856&r2=1510857&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/SettingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/SettingsPanel.java Tue Aug 6 05:22:50 2013
@@ -23,6 +23,9 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
@@ -74,7 +77,14 @@ public class SettingsPanel extends UserP
addPanel(panels, getTabId(SEARCH_TAB_ID), new UserSearchPanel("tab"));
addPanel(panels, getTabId(DASHBOARD_TAB_ID), new WidgetsPanel("tab"));
- add(new JQueryBehavior("#tabs", "tabs", new Options("active", active)));
+ add(new JQueryBehavior("#tabs", "tabs", new Options("active", active)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void renderScript(JavaScriptHeaderItem script, IHeaderResponse response) {
+ response.render(new PriorityHeaderItem(script));
+ }
+ });
add(tabs, panels);
}
}