From b133bd50b2451e286b99eeca1393905fecb25fa6 Mon Sep 17 00:00:00 2001
From: qronald <ronald.quenta@processmaker.com>
Date: Thu, 16 Jun 2016 16:23:42 -0400
Subject: [PATCH] HOR-1312 Agregar el campo GRP_TITLE en la tabla GROUPWF

add method remove in table content
---
 workflow/engine/classes/class.groups.php      |  18 +---
 workflow/engine/classes/class.processMap.php  |  42 ++------
 workflow/engine/classes/class.processes.php   |  27 ++---
 workflow/engine/classes/model/Groupwf.php     | 100 +++++-------------
 .../classes/model/map/GroupwfMapBuilder.php   |   2 +
 .../engine/classes/model/om/BaseGroupwf.php   |  92 +++++++++++++---
 .../classes/model/om/BaseGroupwfPeer.php      |  23 ++--
 workflow/engine/config/schema.xml             |   1 +
 workflow/engine/controllers/dashboard.php     |  13 +--
 workflow/engine/data/mysql/schema.sql         |   1 +
 .../src/ProcessMaker/BusinessModel/Group.php  |  19 +---
 .../BusinessModel/ProcessSupervisor.php       |  16 +--
 .../src/ProcessMaker/BusinessModel/Task.php   |  22 ++--
 13 files changed, 150 insertions(+), 226 deletions(-)

diff --git a/workflow/engine/classes/class.groups.php b/workflow/engine/classes/class.groups.php
index 7ab419557..017728717 100755
--- a/workflow/engine/classes/class.groups.php
+++ b/workflow/engine/classes/class.groups.php
@@ -209,17 +209,11 @@ class Groups
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
-            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-            $oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
             $oCriteria->add(GroupwfPeer::GRP_UID, $gUIDs, Criteria::NOT_IN);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-            $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-            $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-
             if ($filter != '') {
-                $oCriteria->add(ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE);
+                $oCriteria->add(GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE);
             }
-
             return $oCriteria;
         } catch (exception $e) {
             throw $e;
@@ -240,18 +234,12 @@ class Groups
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
-            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
             $oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN);
-            $oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
             $oCriteria->add(GroupUserPeer::USR_UID, $sUserUid, Criteria::EQUAL);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-            $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-            $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-
             if ($filter != '') {
-                $oCriteria->add(ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE);
+                $oCriteria->add(GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE);
             }
-
             return $oCriteria;
         } catch (exception $e) {
             throw $e;
@@ -261,7 +249,7 @@ class Groups
     public function getGroupsForUser($usrUid)
     {
         $criteria = $this->getAssignedGroupsCriteria($usrUid);
-        $criteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+        $criteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
         $dataset = GroupwfPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 679f0c115..6b269e0b4 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -3474,16 +3474,10 @@ class processMap
         );
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-
-        $aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
-        $aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter());
-        $aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $oCriteria->add(GroupwfPeer::GRP_UID, $aGRUS, Criteria::NOT_IN);
 
-        $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+        $oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
         $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
@@ -4068,14 +4062,9 @@ class processMap
         $usersGroups = '<select pm:dependent="0" pm:label="' . G::LoadTranslation('ID_GROUP_USERS') . '" name="form[GROUP_USER]" id="form[GROUP_USER]" class="module_app_input___gray">';
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-        $aConditions = array();
-        $aConditions[] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
-        $aConditions[] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter());
-        $aConditions[] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-        $oCriteria->addAscendingOrderByColumn('GRP_TITLE');
+        $oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
         $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
@@ -5362,13 +5351,7 @@ class processMap
             $sDelimiter = DBAdapter::getStringDelimiter();
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(GroupwfPeer::GRP_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
             $oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN);
             //$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL);
@@ -6649,12 +6632,7 @@ class processMap
         $aUsersGroups[] = array('UID' => 'char', 'LABEL' => 'char' );
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-        $aConditions = array();
-        $aConditions[] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID );
-        $aConditions[] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter() );
-        $aConditions[] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
         $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -7004,13 +6982,7 @@ class processMap
             $sDelimiter = DBAdapter::getStringDelimiter();
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(GroupwfPeer::GRP_UID, 'C.CON_ID' );
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
             $oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN);
             //$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL);
diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index 11b11699f..af4523415 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -4326,10 +4326,7 @@ class Processes
             $criteria = new Criteria("workflow");
 
             $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
-            $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-            $criteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
-            $criteria->add(ContentPeer::CON_CATEGORY, "GRP_TITLE", Criteria::EQUAL);
-            $criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL);
+            $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
 
             $rsCriteria = GroupwfPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4349,7 +4346,7 @@ class Processes
                 foreach ($arrayGroupwf as $key2 => $value2) {
                     $groupwfRecord = $value2;
 
-                    if ($groupwfRecord["CON_VALUE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
+                    if ($groupwfRecord["GRP_TITLE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
                         //Update unique id
                         $uidOld = $data->groupwfs[$key]["GRP_UID"];
 
@@ -4763,12 +4760,8 @@ class Processes
         $aGroupwf = array();
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_ID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-        $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-        $oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
-        $oDataset = ContentPeer::doSelectRS($oCriteria);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+        $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
@@ -4779,7 +4772,7 @@ class Processes
         if (is_array($sGroupList)) {
             foreach ($aGroupwf as $groupBase) {
                 foreach ($sGroupList as $group) {
-                    if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
+                    if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
                         $oPro = GroupwfPeer::retrieveByPk( $group['GRP_UID'] );
                         if(is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
                             $group['GRP_UID'] = G::generateUniqueID();
@@ -4843,12 +4836,8 @@ class Processes
     {
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_ID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-        $oCriteria->add(ContentPeer::CON_LANG, 'en');
-        $oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
-        $oDataset = ContentPeer::doSelectRS($oCriteria);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+        $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
@@ -4859,7 +4848,7 @@ class Processes
         foreach ($sGroupList as $group) {
             $merged = false;
             foreach ($aGroupwf as $groupBase) {
-                if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
+                if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
                     $group['GRP_UID'] = $groupBase['CON_ID'];
                     $mergedGroupList[] = $group;
                     $merged = true;
diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php
index cfeec6c4f..2295a7f84 100755
--- a/workflow/engine/classes/model/Groupwf.php
+++ b/workflow/engine/classes/model/Groupwf.php
@@ -41,36 +41,15 @@ require_once 'classes/model/Content.php';
  */
 class Groupwf extends BaseGroupwf
 {
-    /**
-     * This value goes in the content table
-     *
-     * @var string
-     */
-    //protected $grp_title = '';
-    protected $grp_title = '';
-
-    /**
-     * Get the [grp_title] column value.
-     *
-     * @return string
-     */
-    public function getGrpTitle ()
-    {
-        if ($this->getGrpUid() == '') {
-            throw (new Exception( "Error in getGrpTitle, the GRP_UID can't be blank" ));
-        }
-        $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-        $this->grp_title = Content::load( 'GRP_TITLE', '', $this->getGrpUid(), $lang );
-        return $this->grp_title;
-    }
 
+    protected $grp_title_content = '';
     /**
      * Set the [grp_title] column value.
      *
      * @param string $v new value
      * @return void
      */
-    public function setGrpTitle ($v)
+    public function setGrpTitleContent ($v)
     {
         if ($this->getGrpUid() == '') {
             throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" ));
@@ -81,15 +60,14 @@ class Groupwf extends BaseGroupwf
             $v = (string) $v;
         }
 
-        if ($this->grp_title !== $v || $v === '') {
-            $this->grp_title = $v;
+        if ($this->grp_title_content !== $v || $v === '') {
+            $this->grp_title_content = $v;
             $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-            $res = Content::addContent( 'GRP_TITLE', '', $this->getGrpUid(), $lang, $this->grp_title );
+            $res = Content::addContent( 'GRP_TITLE', '', $this->getGrpUid(), $lang, $this->grp_title_content );
         }
 
     } // set()
 
-
     /**
      * Creates the Group
      *
@@ -107,6 +85,12 @@ class Groupwf extends BaseGroupwf
                 $this->setGrpUid( G::generateUniqueID() );
             }
 
+            if (isset( $aData['GRP_TITLE'] )) {
+                $this->setGrpTitle( $aData['GRP_TITLE'] );
+            } else {
+                $this->setGrpTitle( 'Default Group Title' );
+            }
+
             if (isset( $aData['GRP_STATUS'] )) {
                 $this->setGrpStatus( $aData['GRP_STATUS'] );
             } else {
@@ -124,9 +108,9 @@ class Groupwf extends BaseGroupwf
                 $res = $this->save();
 
                 if (isset( $aData['GRP_TITLE'] )) {
-                    $this->setGrpTitle( $aData['GRP_TITLE'] );
+                    $this->setGrpTitleContent( $aData['GRP_TITLE'] );
                 } else {
-                    $this->setGrpTitle( 'Default Group Title' );
+                    $this->setGrpTitleContent( 'Default Group Title' );
                 }
 
                 $con->commit();
@@ -160,8 +144,6 @@ class Groupwf extends BaseGroupwf
             if (is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
                 $aFields = $oPro->toArray( BasePeer::TYPE_FIELDNAME );
                 $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
-                $aFields['GRP_TITLE'] = $oPro->getGrpTitle();
-                $this->setGrpTitle( $oPro->getGrpTitle() );
                 return $aFields;
             } else {
                 throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -188,7 +170,7 @@ class Groupwf extends BaseGroupwf
                 $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
                 if ($oPro->validate()) {
                     if (isset( $aData['GRP_TITLE'] )) {
-                        $oPro->setGrpTitle( $aData['GRP_TITLE'] );
+                        $oPro->setGrpTitleContent( $aData['GRP_TITLE'] );
                     }
                     $res = $oPro->save();
                     $con->commit();
@@ -226,7 +208,6 @@ class Groupwf extends BaseGroupwf
             $oPro = GroupwfPeer::retrieveByPK( $ProUid );
             if (! is_null( $oPro )) {
                 Content::removeContent( 'GRP_TITLE', '', $oPro->getGrpUid() );
-                Content::removeContent( 'GRP_DESCRIPTION', '', $oPro->getGrpUid() );
                 return $oPro->delete();
             } else {
                 throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -263,12 +244,8 @@ class Groupwf extends BaseGroupwf
         $del = DBAdapter::getStringDelimiter();
 
         $c->clearSelectColumns();
-        $c->addSelectColumn( ContentPeer::CON_CATEGORY );
-        $c->addSelectColumn( ContentPeer::CON_VALUE );
-
-        $c->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $c->add( ContentPeer::CON_VALUE, $Groupname );
-        $c->add( ContentPeer::CON_LANG, SYS_LANG );
+        $c->addSelectColumn( GroupwfPeer::GRP_TITLE );
+        $c->add( GroupwfPeer::GRP_TITLE, $Groupname );
         return $c;
     }
 
@@ -297,17 +274,15 @@ class Groupwf extends BaseGroupwf
         $totalCount = 0;
         $criteria = new Criteria( 'workflow' );
         $criteria->addSelectColumn( GroupwfPeer::GRP_UID );
+        $criteria->addSelectColumn( GroupwfPeer::GRP_TITLE );
         $criteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
         $criteria->addSelectColumn( GroupwfPeer::GRP_LDAP_DN );
         $criteria->addSelectColumn( ContentPeer::CON_VALUE );
-        $criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
         $criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG );
-        $criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
+        $criteria->addAscendingOrderByColumn( GroupwfPeer::GRP_TITLE );
 
         if ($search) {
-            $criteria->add( ContentPeer::CON_VALUE, '%' . $search . '%', Criteria::LIKE );
+            $criteria->add( GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE );
         }
 
         $c = clone $criteria;
@@ -349,33 +324,15 @@ class Groupwf extends BaseGroupwf
         require_once 'classes/model/TaskUser.php';
         require_once 'classes/model/GroupUser.php';
         $sDelimiter = DBAdapter::getStringDelimiter();
-        $aConditions = [
-            [GroupwfPeer::GRP_UID, 'C.CON_ID'],
-            ['C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter],
-            ['C.CON_LANG', 'if((SELECT COUNT(S.CON_ID) FROM CONTENT AS S WHERE S.CON_ID=C.CON_ID AND S.CON_CATEGORY=C.CON_CATEGORY AND S.CON_LANG=' . $sDelimiter . SYS_LANG . $sDelimiter . ')>0,' . $sDelimiter . SYS_LANG . $sDelimiter . ',' . $sDelimiter . 'en' . $sDelimiter . ')']
-        ];
-        $totalCount = 0;
-        $criteria = new Criteria('workflow');
-        $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $criteria->addAlias('C', 'CONTENT');
-        $criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-
-        if ($search) {
-            $criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE);
-        }
-
-        $totalRows = GroupwfPeer::doCount($criteria);
 
         $criteria = new Criteria('workflow');
         $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
+        $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
         $criteria->addSelectColumn(GroupwfPeer::GRP_UX);
-        $criteria->addAlias('C', 'CONTENT');
-        $criteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
-        $criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
 
         if (is_null($sortField) || trim($sortField) == "") {
-            $sortField = 'GRP_TITLE';
+            $sortField = GroupwfPeer::GRP_TITLE;
         }
 
         if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") {
@@ -393,7 +350,7 @@ class Groupwf extends BaseGroupwf
         }
 
         if ($search) {
-            $criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE);
+            $criteria->add(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
         }
 
         $oDataset = GroupwfPeer::doSelectRS($criteria);
@@ -406,7 +363,7 @@ class Groupwf extends BaseGroupwf
             $groups[] = $oDataset->getRow();
         }
 
-        return array('rows' => $groups, 'totalCount' => $totalRows);
+        return array('rows' => $groups, 'totalCount' => count($groups));
     }
 
     public function filterGroup ($filter, $start, $limit)
@@ -426,11 +383,8 @@ class Groupwf extends BaseGroupwf
 
         $oCriteria = new Criteria( 'workflow' );
         $oCriteria->addSelectColumn( GroupwfPeer::GRP_UID );
-        $oCriteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
         if ($filter != '') {
-            $oCriteria->add( ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE );
+            $oCriteria->add( GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE );
         }
         $totalRows = GroupwfPeer::doCount( $oCriteria );
 
@@ -438,14 +392,10 @@ class Groupwf extends BaseGroupwf
         $oCriteria->clearSelectColumns();
         $oCriteria->addSelectColumn( GroupwfPeer::GRP_UID );
         $oCriteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
-        $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
         $oCriteria->addAsColumn( 'GRP_TASKS', 0 );
         $oCriteria->addAsColumn( 'GRP_USERS', 0 );
-        $oCriteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
         if ($filter != '') {
-            $oCriteria->add( ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE );
+            $oCriteria->add( GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE );
         }
         $oCriteria->setOffset( $start );
         $oCriteria->setLimit( $limit );
diff --git a/workflow/engine/classes/model/map/GroupwfMapBuilder.php b/workflow/engine/classes/model/map/GroupwfMapBuilder.php
index a6c7bf436..02da56fb2 100755
--- a/workflow/engine/classes/model/map/GroupwfMapBuilder.php
+++ b/workflow/engine/classes/model/map/GroupwfMapBuilder.php
@@ -67,6 +67,8 @@ class GroupwfMapBuilder
 
         $tMap->addPrimaryKey('GRP_UID', 'GrpUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('GRP_TITLE', 'GrpTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
         $tMap->addColumn('GRP_STATUS', 'GrpStatus', 'string', CreoleTypes::CHAR, true, 8);
 
         $tMap->addColumn('GRP_LDAP_DN', 'GrpLdapDn', 'string', CreoleTypes::VARCHAR, true, 255);
diff --git a/workflow/engine/classes/model/om/BaseGroupwf.php b/workflow/engine/classes/model/om/BaseGroupwf.php
index 948522ea8..ad010636b 100755
--- a/workflow/engine/classes/model/om/BaseGroupwf.php
+++ b/workflow/engine/classes/model/om/BaseGroupwf.php
@@ -31,7 +31,13 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
      * The value for the grp_uid field.
      * @var        string
      */
-    protected $grp_uid = '';
+    protected $grp_uid;
+
+    /**
+     * The value for the grp_title field.
+     * @var        string
+     */
+    protected $grp_title;
 
     /**
      * The value for the grp_status field.
@@ -76,6 +82,17 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
         return $this->grp_uid;
     }
 
+    /**
+     * Get the [grp_title] column value.
+     * 
+     * @return     string
+     */
+    public function getGrpTitle()
+    {
+
+        return $this->grp_title;
+    }
+
     /**
      * Get the [grp_status] column value.
      * 
@@ -124,13 +141,35 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
             $v = (string) $v;
         }
 
-        if ($this->grp_uid !== $v || $v === '') {
+        if ($this->grp_uid !== $v) {
             $this->grp_uid = $v;
             $this->modifiedColumns[] = GroupwfPeer::GRP_UID;
         }
 
     } // setGrpUid()
 
+    /**
+     * Set the value of [grp_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setGrpTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->grp_title !== $v) {
+            $this->grp_title = $v;
+            $this->modifiedColumns[] = GroupwfPeer::GRP_TITLE;
+        }
+
+    } // setGrpTitle()
+
     /**
      * Set the value of [grp_status] column.
      * 
@@ -216,18 +255,20 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
 
             $this->grp_uid = $rs->getString($startcol + 0);
 
-            $this->grp_status = $rs->getString($startcol + 1);
+            $this->grp_title = $rs->getString($startcol + 1);
 
-            $this->grp_ldap_dn = $rs->getString($startcol + 2);
+            $this->grp_status = $rs->getString($startcol + 2);
 
-            $this->grp_ux = $rs->getString($startcol + 3);
+            $this->grp_ldap_dn = $rs->getString($startcol + 3);
+
+            $this->grp_ux = $rs->getString($startcol + 4);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 4; // 4 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 5; // 5 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Groupwf object", $e);
@@ -435,12 +476,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
                 return $this->getGrpUid();
                 break;
             case 1:
-                return $this->getGrpStatus();
+                return $this->getGrpTitle();
                 break;
             case 2:
-                return $this->getGrpLdapDn();
+                return $this->getGrpStatus();
                 break;
             case 3:
+                return $this->getGrpLdapDn();
+                break;
+            case 4:
                 return $this->getGrpUx();
                 break;
             default:
@@ -464,9 +508,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
         $keys = GroupwfPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getGrpUid(),
-            $keys[1] => $this->getGrpStatus(),
-            $keys[2] => $this->getGrpLdapDn(),
-            $keys[3] => $this->getGrpUx(),
+            $keys[1] => $this->getGrpTitle(),
+            $keys[2] => $this->getGrpStatus(),
+            $keys[3] => $this->getGrpLdapDn(),
+            $keys[4] => $this->getGrpUx(),
         );
         return $result;
     }
@@ -502,12 +547,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
                 $this->setGrpUid($value);
                 break;
             case 1:
-                $this->setGrpStatus($value);
+                $this->setGrpTitle($value);
                 break;
             case 2:
-                $this->setGrpLdapDn($value);
+                $this->setGrpStatus($value);
                 break;
             case 3:
+                $this->setGrpLdapDn($value);
+                break;
+            case 4:
                 $this->setGrpUx($value);
                 break;
         } // switch()
@@ -538,15 +586,19 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setGrpStatus($arr[$keys[1]]);
+            $this->setGrpTitle($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setGrpLdapDn($arr[$keys[2]]);
+            $this->setGrpStatus($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setGrpUx($arr[$keys[3]]);
+            $this->setGrpLdapDn($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setGrpUx($arr[$keys[4]]);
         }
 
     }
@@ -564,6 +616,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
             $criteria->add(GroupwfPeer::GRP_UID, $this->grp_uid);
         }
 
+        if ($this->isColumnModified(GroupwfPeer::GRP_TITLE)) {
+            $criteria->add(GroupwfPeer::GRP_TITLE, $this->grp_title);
+        }
+
         if ($this->isColumnModified(GroupwfPeer::GRP_STATUS)) {
             $criteria->add(GroupwfPeer::GRP_STATUS, $this->grp_status);
         }
@@ -630,6 +686,8 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setGrpTitle($this->grp_title);
+
         $copyObj->setGrpStatus($this->grp_status);
 
         $copyObj->setGrpLdapDn($this->grp_ldap_dn);
@@ -639,7 +697,7 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
 
         $copyObj->setNew(true);
 
-        $copyObj->setGrpUid(''); // this is a pkey column, so set to default value
+        $copyObj->setGrpUid(NULL); // this is a pkey column, so set to default value
 
     }
 
diff --git a/workflow/engine/classes/model/om/BaseGroupwfPeer.php b/workflow/engine/classes/model/om/BaseGroupwfPeer.php
index d90262069..13567c5fb 100755
--- a/workflow/engine/classes/model/om/BaseGroupwfPeer.php
+++ b/workflow/engine/classes/model/om/BaseGroupwfPeer.php
@@ -25,7 +25,7 @@ abstract class BaseGroupwfPeer
     const CLASS_DEFAULT = 'classes.model.Groupwf';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 4;
+    const NUM_COLUMNS = 5;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseGroupwfPeer
     /** the column name for the GRP_UID field */
     const GRP_UID = 'GROUPWF.GRP_UID';
 
+    /** the column name for the GRP_TITLE field */
+    const GRP_TITLE = 'GROUPWF.GRP_TITLE';
+
     /** the column name for the GRP_STATUS field */
     const GRP_STATUS = 'GROUPWF.GRP_STATUS';
 
@@ -54,10 +57,10 @@ abstract class BaseGroupwfPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ),
-        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ),
-        BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
+        BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpTitle', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ),
+        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_TITLE, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ),
+        BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_TITLE', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
     );
 
     /**
@@ -67,10 +70,10 @@ abstract class BaseGroupwfPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpStatus' => 1, 'GrpLdapDn' => 2, 'GrpUx' => 3, ),
-        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_STATUS => 1, GroupwfPeer::GRP_LDAP_DN => 2, GroupwfPeer::GRP_UX => 3, ),
-        BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_STATUS' => 1, 'GRP_LDAP_DN' => 2, 'GRP_UX' => 3, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
+        BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpTitle' => 1, 'GrpStatus' => 2, 'GrpLdapDn' => 3, 'GrpUx' => 4, ),
+        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_TITLE => 1, GroupwfPeer::GRP_STATUS => 2, GroupwfPeer::GRP_LDAP_DN => 3, GroupwfPeer::GRP_UX => 4, ),
+        BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_TITLE' => 1, 'GRP_STATUS' => 2, 'GRP_LDAP_DN' => 3, 'GRP_UX' => 4, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
     );
 
     /**
@@ -173,6 +176,8 @@ abstract class BaseGroupwfPeer
 
         $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
 
+        $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+
         $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
 
         $criteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 6395c2024..f8a13ad51 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -532,6 +532,7 @@
       <parameter name="Comment" value=""/>
     </vendor>
     <column name="GRP_UID" type="VARCHAR" size="32" required="true" primaryKey="true"/>
+    <column name="GRP_TITLE" type="LONGVARCHAR" required="true"/>
     <column name="GRP_STATUS" type="CHAR" size="8" required="true" default="ACTIVE"/>
     <column name="GRP_LDAP_DN" type="VARCHAR" size="255" required="true" default=""/>
     <column name="GRP_UX" type="VARCHAR" size="128" default="NORMAL"/>
diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index bc7d469c2..a4c233d16 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -390,20 +390,11 @@ class Dashboard extends Controller
                     $criteria = new Criteria( 'workflow' );
                     $criteria->setDistinct();
                     $criteria->addSelectColumn( GroupwfPeer::GRP_UID );
-                    $criteria->addSelectColumn( ContentPeer::CON_VALUE );
-                    //FROM
-                    $conditions = array ();
-                    $conditions[] = array (GroupwfPeer::GRP_UID,ContentPeer::CON_ID
-                    );
-                    $conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter()
-                    );
-                    $conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
-                    );
-                    $criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
+                    $criteria->addSelectColumn( GroupwfPeer::GRP_TITLE );
                     //WHERE
                     $criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
                     //ORDER BY
-                    $criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
+                    $criteria->addAscendingOrderByColumn( GroupwfPeer::GRP_TITLE );
 
                     $dataset = GroupwfPeer::doSelectRS( $criteria );
                     $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 09d25a82e..328dc3742 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -244,6 +244,7 @@ DROP TABLE IF EXISTS `GROUPWF`;
 CREATE TABLE `GROUPWF`
 (
 	`GRP_UID` VARCHAR(32)  NOT NULL,
+	`GRP_TITLE` MEDIUMTEXT  NOT NULL,
 	`GRP_STATUS` CHAR(8) default 'ACTIVE' NOT NULL,
 	`GRP_LDAP_DN` VARCHAR(255) default '' NOT NULL,
 	`GRP_UX` VARCHAR(128) default 'NORMAL',
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Group.php b/workflow/engine/src/ProcessMaker/BusinessModel/Group.php
index 8dd719b6f..8a4681175 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Group.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Group.php
@@ -102,20 +102,13 @@ class Group
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\GroupwfPeer::GRP_UID);
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\GroupwfPeer::GRP_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
+            $criteria->addSelectColumn(\GroupwfPeer::GRP_TITLE);
 
             if ($groupUidExclude != "") {
                 $criteria->add(\GroupwfPeer::GRP_UID, $groupUidExclude, \Criteria::NOT_EQUAL);
             }
 
-            $criteria->add("CT.CON_VALUE", $groupTitle, \Criteria::EQUAL);
+            $criteria->add(\GroupwfPeer::GRP_TITLE, $groupTitle, \Criteria::EQUAL);
 
             $rsCriteria = \GroupwfPeer::doSelectRS($criteria);
 
@@ -314,14 +307,10 @@ class Group
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\GroupwfPeer::GRP_UID);
+            $criteria->addSelectColumn(\GroupwfPeer::GRP_TITLE);
             $criteria->addSelectColumn(\GroupwfPeer::GRP_STATUS);
             $criteria->addSelectColumn(\GroupwfPeer::GRP_LDAP_DN);
             $criteria->addSelectColumn(\GroupwfPeer::GRP_UX);
-            $criteria->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
-            $criteria->addJoin(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN);
-            $criteria->add(\ContentPeer::CON_CATEGORY, "GRP_TITLE", \Criteria::EQUAL);
-            $criteria->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL);
-
             return $criteria;
         } catch (\Exception $e) {
             throw $e;
@@ -508,7 +497,7 @@ class Group
 
                 $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
 
-                $criteria->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
+                $criteria->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
             }
 
             //Number records total
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
index e0b809835..5f99b63f1 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
@@ -111,7 +111,7 @@ class ProcessSupervisor
                 $criteriaGroup = new \Criteria("workflow");
 
                 $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID);
-                $criteriaGroup->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
+                $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_TITLE);
 
                 switch ($option) {
                     case "ASSIGNED":
@@ -122,12 +122,6 @@ class ProcessSupervisor
                         $arrayCondition[] = array(\GroupwfPeer::GRP_STATUS, $delimiter . "ACTIVE" . $delimiter, \Criteria::EQUAL);
                         $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
 
-                        $arrayCondition = array();
-                        $arrayCondition[] = array(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_CATEGORY, $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-                        $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
                         $criteriaGroup->add(\ProcessUserPeer::PU_TYPE, "GROUP_SUPERVISOR", \Criteria::EQUAL);
                         $criteriaGroup->add(\ProcessUserPeer::PRO_UID, $processUid, \Criteria::EQUAL);
                         break;
@@ -145,12 +139,6 @@ class ProcessSupervisor
                                " . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . "
                         ";
 
-                        $arrayCondition = array();
-                        $arrayCondition[] = array(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_CATEGORY, $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-                        $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
                         $criteriaGroup->add(
                             $criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_UID, $arrayGroupUid, \Criteria::NOT_IN)->addAnd(
                             $criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL))->addAnd(
@@ -168,7 +156,7 @@ class ProcessSupervisor
 
                     $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
 
-                    $criteriaGroup->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
+                    $criteriaGroup->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
                 }
 
                 //Number records total
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index d4de092b6..1e8fbb876 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -909,7 +909,7 @@ class Task
                 $criteriaGroup = new \Criteria("workflow");
 
                 $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID);
-                $criteriaGroup->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
+                $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_TITLE);
 
                 switch ($option) {
                     case "ASSIGNEE":
@@ -923,10 +923,6 @@ class Task
                         break;
                 }
 
-                $criteriaGroup->addJoin(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN);
-                $criteriaGroup->add(\ContentPeer::CON_CATEGORY, "GRP_TITLE", \Criteria::EQUAL);
-                $criteriaGroup->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL);
-
                 if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]) && trim($arrayFilterData["filter"]) != "") {
                     $arraySearch = array(
                         ""      => "%" . $arrayFilterData["filter"] . "%",
@@ -936,7 +932,7 @@ class Task
 
                     $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
 
-                    $criteriaGroup->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
+                    $criteriaGroup->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
                 }
 
                 $criteriaGroup->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL);
@@ -1212,12 +1208,9 @@ class Task
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
-            $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
-            $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
-            $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-            $criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
+            $criteria->addSelectColumn( \GroupwfPeer::GRP_TITLE );
             $criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
-            $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
+            $criteria->addAscendingOrderByColumn( \GroupwfPeer::GRP_TITLE );
             $oDataset = \GroupwfPeer::doSelectRS( $criteria );
             $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
             $groups = array ();
@@ -1434,14 +1427,11 @@ class Task
             }
             $criteria = new \Criteria( 'workflow' );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
+            $criteria->addSelectColumn( \GroupwfPeer::GRP_TITLE );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
-            $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
-            $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
-            $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-            $criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
             $criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
-            $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
+            $criteria->addAscendingOrderByColumn( \GroupwfPeer::GRP_TITLE );
             $oDataset = \GroupwfPeer::doSelectRS( $criteria );
             $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
             $groups = array ();