[jboss-svn-commits] JBL Code SVN: r38354 - in labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums: ui/action and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 14 07:27:03 EDT 2013
Author: sviluppatorefico
Date: 2013-06-14 07:27:02 -0400 (Fri, 14 Jun 2013)
New Revision: 38354
Modified:
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
Log:
bug fixing on lock, move and delete of forums
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2013-06-14 11:25:59 UTC (rev 38353)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2013-06-14 11:27:02 UTC (rev 38354)
@@ -68,7 +68,7 @@
@NamedQuery(name = "findForumsByCategoryId", query = "from ForumImpl as f where f.category=:categoryId "
+ "order by f.order asc"),
@NamedQuery(name = "getLastForumOrder", query = "select max(f.order) from ForumImpl as "
- + "f where f.category = :categoryId"),
+ + "f where f.category.id = :categoryId"),
@NamedQuery(name = "findPostsFromCategoryasc", query = "select p from ForumImpl as f join f.topics "
+ "as t join t.posts as p where f.category.id = :categoryId order by p.createDate "
+ "asc"),
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2013-06-14 11:25:59 UTC (rev 38353)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2013-06-14 11:27:02 UTC (rev 38354)
@@ -762,7 +762,7 @@
EntityManager session = getSession();
try {
// session.flush();
- session.remove(category);
+ session.remove(session.find(CategoryImpl.class, category.getId()));
session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required
// for clustered versions
// session.flush();
@@ -776,13 +776,7 @@
public void removeForum(Forum forum) throws ModuleException {
EntityManager session = getSession();
try {
- // session.remove(forum);
- if (forum.getCategory() != null) {
- forum.getCategory().getForums().remove(forum);
- forum.setCategory(null);
- } else {
- session.remove(forum);
- }
+ session.remove(session.find(ForumImpl.class, forum.getId()));
session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required
// for clustered versions
@@ -869,7 +863,7 @@
try {
EntityManager session = getSession();
Query query = session.createNamedQuery("getLastForumOrder");
- query.setParameter("categoryId", "" + category.getId());
+ query.setParameter("categoryId", ""+ category.getId());
Integer lastForumOrder = (Integer) uniqueElement(query
.getResultList());
return (lastForumOrder != null) ? lastForumOrder.intValue() : 0;
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2013-06-14 11:25:59 UTC (rev 38353)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2013-06-14 11:27:02 UTC (rev 38354)
@@ -384,6 +384,7 @@
//grab the category from the module and set the title
Category category = getForumsModule(forumsModule).findCategoryById(categoryId);
category.setTitle(this.categoryName);
+ getForumsModule(forumsModule).update(category);
String start = JSFUtil.getBundleMessage("ResourceJSF","Category_updated_0");
String end = JSFUtil.getBundleMessage("ResourceJSF","Category_updated_1");
@@ -519,6 +520,7 @@
forum.setCategory((CategoryImpl)selectedCategory);
forum.setName(this.forumName);
forum.setDescription(this.forumDescription);
+ getForumsModule(forumsModule).update(forum);
String start = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_0");
String end = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_1");
@@ -567,14 +569,17 @@
target.getTopics().addAll(source.getTopics());
target.setPostCount(target.getPostCount() + source.getPostCount());
target.setTopicCount(target.getTopicCount() + source.getTopicCount());
+ getForumsModule(forumsModule).update(target);
for (Iterator i = target.getTopics().iterator(); i.hasNext();)
{
TopicImpl tp = (TopicImpl)i.next();
tp.setForum((ForumImpl)target);
+ getForumsModule(forumsModule).update(tp);
}
//clear the source out before delete
source.setTopics(new ArrayList());
+ getForumsModule(forumsModule).update(source);
} else {
source = getForumsModule(forumsModule).findForumById(forumId);
}
@@ -623,7 +628,8 @@
}
Category category = getForumsModule(forumsModule).findCategoryById(categoryId);
- category.setOrder(category.getOrder() + AdminController.up);
+ category.setOrder(category.getOrder() + AdminController.up);
+ getForumsModule(forumsModule).update(category);
// Luca Stancapiano start
//get the forumInstanceId where this forum should be added
@@ -640,7 +646,8 @@
for (int index = 10; categories.hasNext(); index += 10)
{
category = (CategoryImpl)categories.next();
- category.setOrder(index);
+ category.setOrder(index);
+ getForumsModule(forumsModule).update(category);
}
}
catch(Exception e)
@@ -668,7 +675,8 @@
}
Category category = getForumsModule(forumsModule).findCategoryById(categoryId);
- category.setOrder(category.getOrder() + AdminController.down);
+ category.setOrder(category.getOrder() + AdminController.down);
+ getForumsModule(forumsModule).update(category);
// Luca Stancapiano start
//get the forumInstanceId where this forum should be added
@@ -685,7 +693,8 @@
for (int index = 10; categories.hasNext(); index += 10)
{
category = (CategoryImpl)categories.next();
- category.setOrder(index);
+ category.setOrder(index);
+ getForumsModule(forumsModule).update(category);
}
}
catch(Exception e)
@@ -713,12 +722,14 @@
}
Forum forum = getForumsModule(forumsModule).findForumById(forumId);
- forum.setOrder(forum.getOrder() + AdminController.up);
+ forum.setOrder(forum.getOrder() + AdminController.up);
+ getForumsModule(forumsModule).update(forum);
Iterator forums = getForumsModule(forumsModule).findForumsByCategoryId(forum.getCategory().getId()).iterator();
for (int index = 10; forums.hasNext(); index += 10)
{
forum = (ForumImpl)forums.next();
- forum.setOrder(index);
+ forum.setOrder(index);
+ getForumsModule(forumsModule).update(forum);
}
}
catch(Exception e)
@@ -746,12 +757,14 @@
}
Forum forum = getForumsModule(forumsModule).findForumById(forumId);
- forum.setOrder(forum.getOrder() + AdminController.down);
+ forum.setOrder(forum.getOrder() + AdminController.down);
+ getForumsModule(forumsModule).update(forum);
Iterator forums = getForumsModule(forumsModule).findForumsByCategoryId(forum.getCategory().getId()).iterator();
for (int index = 10; forums.hasNext(); index += 10)
{
forum = (ForumImpl)forums.next();
- forum.setOrder(index);
+ forum.setOrder(index);
+ getForumsModule(forumsModule).update(forum);
}
}
catch(Exception e)
@@ -777,7 +790,8 @@
}
Forum forum = getForumsModule(forumsModule).findForumById(forumId);
- forum.setStatus(Constants.FORUM_LOCKED);
+ forum.setStatus(Constants.FORUM_LOCKED);
+ getForumsModule(forumsModule).update(forum);
String message = JSFUtil.getBundleMessage("ResourceJSF","Forum_locked");
JSFUtil.setMessage(Constants.FEEDBACK,message);
}
@@ -809,7 +823,8 @@
}
Forum forum = getForumsModule(forumsModule).findForumById(forumId);
- forum.setStatus(Constants.FORUM_UNLOCKED);
+ forum.setStatus(Constants.FORUM_UNLOCKED);
+ getForumsModule(forumsModule).update(forum);
String message = JSFUtil.getBundleMessage("ResourceJSF","Forum_unlocked");
JSFUtil.setMessage(Constants.FEEDBACK,message);
}
More information about the jboss-svn-commits
mailing list