[jboss-svn-commits] JBL Code SVN: r38352 - in labs/jbossforums/branches/noejbforums130P27/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:23:55 EDT 2013
Author: sviluppatorefico
Date: 2013-06-14 07:23:55 -0400 (Fri, 14 Jun 2013)
New Revision: 38352
Modified:
labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
Log:
bug fixing on lock, move and delete of forums
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2013-06-14 06:54:19 UTC (rev 38351)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2013-06-14 11:23:55 UTC (rev 38352)
@@ -972,17 +972,7 @@
Session session = getSession();
try
{
- //session.delete(forum);
- if (forum.getCategory() != null)
- {
- forum.getCategory().getForums().remove(forum);
- forum.setCategory(null);
- }
- else
- {
- session.delete(forum);
- }
-
+ session.delete(session.get(ForumImpl.class, forum.getId()));
session.flush(); // Luca Stancapiano - 8 feb 2008 - it is required for clustered versions
//session.flush();
}
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2013-06-14 06:54:19 UTC (rev 38351)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2013-06-14 11:23:55 UTC (rev 38352)
@@ -368,7 +368,8 @@
//grab the category from the module and set the title
Category category = BaseController.getForumsModule().findCategoryById(categoryId);
- category.setTitle(this.categoryName);
+ category.setTitle(this.categoryName);
+ getForumsModule().update(category);
String start = JSFUtil.getBundleMessage("ResourceJSF","Category_updated_0");
String end = JSFUtil.getBundleMessage("ResourceJSF","Category_updated_1");
@@ -505,7 +506,7 @@
forum.setCategory(selectedCategory);
forum.setName(this.forumName);
forum.setDescription(this.forumDescription);
- getForumsModule().getHibernate().getSessionFactory().getCurrentSession().flush();
+ getForumsModule().update(forum);
String start = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_0");
String end = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_1");
@@ -554,14 +555,17 @@
target.getTopics().addAll(source.getTopics());
target.setPostCount(target.getPostCount() + source.getPostCount());
target.setTopicCount(target.getTopicCount() + source.getTopicCount());
+ BaseController.getForumsModule().update(target);
for (Iterator i = target.getTopics().iterator(); i.hasNext();)
{
Topic tp = (Topic)i.next();
tp.setForum(target);
+ BaseController.getForumsModule().update(tp);
}
//clear the source out before delete
source.setTopics(new ArrayList());
+ BaseController.getForumsModule().update(source);
} else {
source = BaseController.getForumsModule().findForumById(forumId);
}
@@ -610,7 +614,8 @@
}
Category category = BaseController.getForumsModule().findCategoryById(categoryId);
- category.setOrder(category.getOrder() + AdminController.up);
+ category.setOrder(category.getOrder() + AdminController.up);
+ getForumsModule().update(category);
// Luca Stancapiano start
//get the forumInstanceId where this forum should be added
@@ -627,7 +632,8 @@
for (int index = 10; categories.hasNext(); index += 10)
{
category = (Category)categories.next();
- category.setOrder(index);
+ category.setOrder(index);
+ getForumsModule().update(category);
}
}
catch(Exception e)
@@ -655,7 +661,8 @@
}
Category category = BaseController.getForumsModule().findCategoryById(categoryId);
- category.setOrder(category.getOrder() + AdminController.down);
+ category.setOrder(category.getOrder() + AdminController.down);
+ getForumsModule().update(category);
// Luca Stancapiano start
//get the forumInstanceId where this forum should be added
@@ -672,7 +679,8 @@
for (int index = 10; categories.hasNext(); index += 10)
{
category = (Category)categories.next();
- category.setOrder(index);
+ category.setOrder(index);
+ getForumsModule().update(category);
}
}
catch(Exception e)
@@ -700,12 +708,14 @@
}
Forum forum = BaseController.getForumsModule().findForumById(forumId);
- forum.setOrder(forum.getOrder() + AdminController.up);
+ forum.setOrder(forum.getOrder() + AdminController.up);
+ getForumsModule().update(forum);
Iterator forums = BaseController.getForumsModule().findForumsByCategoryId(forum.getCategory().getId()).iterator();
for (int index = 10; forums.hasNext(); index += 10)
{
forum = (Forum)forums.next();
- forum.setOrder(index);
+ forum.setOrder(index);
+ getForumsModule().update(forum);
}
}
catch(Exception e)
@@ -733,12 +743,14 @@
}
Forum forum = BaseController.getForumsModule().findForumById(forumId);
- forum.setOrder(forum.getOrder() + AdminController.down);
+ forum.setOrder(forum.getOrder() + AdminController.down);
+ getForumsModule().update(forum);
Iterator forums = BaseController.getForumsModule().findForumsByCategoryId(forum.getCategory().getId()).iterator();
for (int index = 10; forums.hasNext(); index += 10)
{
forum = (Forum)forums.next();
- forum.setOrder(index);
+ forum.setOrder(index);
+ getForumsModule().update(forum);
}
}
catch(Exception e)
@@ -764,7 +776,8 @@
}
Forum forum = BaseController.getForumsModule().findForumById(forumId);
- forum.setStatus(Constants.FORUM_LOCKED);
+ forum.setStatus(Constants.FORUM_LOCKED);
+ getForumsModule().update(forum);
String message = JSFUtil.getBundleMessage("ResourceJSF","Forum_locked");
JSFUtil.setMessage(Constants.FEEDBACK,message);
}
@@ -796,7 +809,8 @@
}
Forum forum = BaseController.getForumsModule().findForumById(forumId);
- forum.setStatus(Constants.FORUM_UNLOCKED);
+ forum.setStatus(Constants.FORUM_UNLOCKED);
+ getForumsModule().update(forum);
String message = JSFUtil.getBundleMessage("ResourceJSF","Forum_unlocked");
JSFUtil.setMessage(Constants.FEEDBACK,message);
}
More information about the jboss-svn-commits
mailing list