fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 9830 "En Advanced Search no funciona la busqueda por..." SOLVED

Browse Source 
- In AdvancedSearch no performs searches for user and category
- Problem solved, have been added to SOLR missing criteria for the search
- Note. - To register/upgrade the new criteria in the SOLR server, run the
  following script:
      $ php reindex_solr.php workspace_name reindexall
* Available from version 2.0.45
This commit is contained in:
Victor Saisa Lopez
2012-11-05 15:14:51 -04:00
parent 7f5911f85f
commit 977969985e
5 changed files with 760 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
workflow/engine/templates/cases/casesList.js
View File

@@ -479,7 +479,7 @@ Ext.onReady ( function() {
function renderNote(val,p,r) {
pro = r.json.PRO_UID;
tas = r.json.TAS_UID;
appUid = r.data['APP_UID'];
title = r.data['APP_TITLE'];
return '<img src="/images/ext/default/s.gif" class="x-tree-node-icon ICON_CASES_NOTES" unselectable="off" id="extdd-17" onClick="openCaseNotesWindow(\''+appUid+'\', true, \''+title+'\', \''+pro+'\', \''+tas+'\')">';
@@ -514,7 +514,7 @@ Ext.onReady ( function() {
if( c.id == 'unpauseLink') c.renderer = unpauseLink;
if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary;
if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote;
if (solrEnabled != 1) {
if (solrEnabled == 0) {
if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name;
if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name;
}
@@ -1459,8 +1459,6 @@ Ext.onReady ( function() {
value: ''
});
var optionCategory = (solrEnabled == 1)? [""] : [_("ID_CATEGORY"), comboCategory, "-"];
var toolbarTodo = [
optionMenuOpen,
{
@@ -1476,7 +1474,9 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1498,7 +1498,9 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1520,7 +1522,9 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1544,7 +1548,9 @@ Ext.onReady ( function() {
menu: menuItems
},
'->',
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1561,7 +1567,9 @@ Ext.onReady ( function() {
var toolbarToRevise = [
optionMenuOpen,
'->', // begin using the right-justified button container
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1586,7 +1594,9 @@ Ext.onReady ( function() {
_("ID_USER"),
comboAllUsers,
"-",
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_("ID_PROCESS"),
comboProcess,
textSearch,
@@ -1604,7 +1614,9 @@ Ext.onReady ( function() {
'-',
btnAll,
'->', // begin using the right-justified button container
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
@@ -1640,8 +1652,6 @@ Ext.onReady ( function() {
})
];
var arrayAux = (solrEnabled == 1)? [""] : ["-", _("ID_USER"), comboUser];
var firstToolbarSearch = new Ext.Toolbar({
region: 'north',
width: '100%',
@@ -1649,13 +1659,17 @@ Ext.onReady ( function() {
items: [
optionMenuOpen,
'->',
optionCategory,
_("ID_CATEGORY"),
comboCategory,
"-",
_('ID_PROCESS'),
comboProcess,
'-',
_('ID_STATUS'),
comboStatus,
arrayAux,
"-",
_("ID_USER"),
comboUser,
'-',
textSearch,
resetSearchButton,
@@ -1878,46 +1892,50 @@ var gridForm = new Ext.FormPanel({
//Manually trigger the data store load
switch (action) {
case "draft":
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "sent":
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "to_revise":
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "to_reassign":
storeCases.setBaseParam("user", comboAllUsers.store.getAt(0).get(comboAllUsers.valueField));
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "search":
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
if (!(solrEnabled == 1)) {
storeCases.setBaseParam("user", comboUser.store.getAt(0).get(comboUser.valueField));
}
storeCases.setBaseParam("user", comboUser.store.getAt(0).get(comboUser.valueField));
storeCases.setBaseParam("search", textSearch.getValue());
storeCases.setBaseParam("dateFrom", dateFrom.getValue());
storeCases.setBaseParam("dateTo", dateTo.getValue());
break;
case "unassigned":
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "gral":
storeCases.setBaseParam("process", '');
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("search", textSearch.getValue());
break;
default:
//todo
storeCases.setBaseParam("process", '');
//paused
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("search", textSearch.getValue());
break;
}
@@ -2031,6 +2049,7 @@ var gridForm = new Ext.FormPanel({
// Nothing to do
}
comboCategory.setValue("");
comboProcess.setValue("");
comboStatus.setValue("");
comboUser.setValue("CURRENT_USER");