Merge pull request #1794 from ralpheav/master

BUG 11919: Not able to use the product, immediate logout after: error ColumnMap for undefined column: CASE_SUMMARY
This commit is contained in:
julceslauhub
2013-06-07 11:13:07 -07:00
2 changed files with 7 additions and 0 deletions

View File

@@ -26,6 +26,10 @@ $dateFrom = isset( $_POST["dateFrom"] ) ? substr( $_POST["dateFrom"], 0, 10 ) :
$dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : "";
$first = isset( $_POST["first"] ) ? true :false;
if ($sort == 'CASE_SUMMARY' || $sort == 'CASE_NOTES_COUNT') {
$sort = 'APP_NUMBER';//DEFAULT VALUE
}
try {
$userUid = (isset($_SESSION["USER_LOGGED"]) && $_SESSION["USER_LOGGED"] != "")? $_SESSION["USER_LOGGED"] : null;
$result = "";

View File

@@ -573,6 +573,9 @@ Ext.onReady ( function() {
if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary;
if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote;
if( c.dataIndex == 'CASE_SUMMARY') c.sortable = false;
if( c.dataIndex == 'CASE_NOTES_COUNT') c.sortable = false;
//Format the name if is disabled solr, otherwise show without format
if (solrEnabled == 0) {
if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name;