BUG 9830 "En Advanced Search no funciona la busqueda por el..." SOLVED
- Solr no esta implementado para busquedas con cualquier usuario, esto en "Advanced Search" - Se ha quitado el dropDown user en "Advanced Search" cuando Solr esta habilitado * Available from version 2.0.44
This commit is contained in:
@@ -95,12 +95,10 @@
|
|||||||
$oHeadPublisher->assign('PMDateFormat', $dateFormat); //sending the fields to get from proxy
|
$oHeadPublisher->assign('PMDateFormat', $dateFormat); //sending the fields to get from proxy
|
||||||
$oHeadPublisher->assign('statusValues', $status); //Sending the listing of status
|
$oHeadPublisher->assign('statusValues', $status); //Sending the listing of status
|
||||||
$oHeadPublisher->assign('processValues', $processes); //Sending the listing of processes
|
$oHeadPublisher->assign('processValues', $processes); //Sending the listing of processes
|
||||||
$oHeadPublisher->assign('solrConf', System::solrEnv()); //Sending the status of solar
|
|
||||||
$oHeadPublisher->assign('categoryValues', $category); //Sending the listing of categories
|
$oHeadPublisher->assign('categoryValues', $category); //Sending the listing of categories
|
||||||
$oHeadPublisher->assign('userValues', $users); //Sending the listing of users
|
$oHeadPublisher->assign('userValues', $users); //Sending the listing of users
|
||||||
$oHeadPublisher->assign('allUsersValues',$allUsers); //Sending the listing of all users
|
$oHeadPublisher->assign('allUsersValues',$allUsers); //Sending the listing of all users
|
||||||
|
$oHeadPublisher->assign("solrEnabled", (($aux = System::solrEnv()) !== false)? 1 : 0); //Sending the status of solar
|
||||||
|
|
||||||
|
|
||||||
//menu permissions
|
//menu permissions
|
||||||
/*$c = new Criteria('workflow');
|
/*$c = new Criteria('workflow');
|
||||||
|
|||||||
@@ -22,21 +22,12 @@ try {
|
|||||||
$userUid = (isset($_SESSION["USER_LOGGED"]) && $_SESSION["USER_LOGGED"] != "")? $_SESSION["USER_LOGGED"] : null;
|
$userUid = (isset($_SESSION["USER_LOGGED"]) && $_SESSION["USER_LOGGED"] != "")? $_SESSION["USER_LOGGED"] : null;
|
||||||
$user = ($user == "CURRENT_USER")? $userUid : $user;
|
$user = ($user == "CURRENT_USER")? $userUid : $user;
|
||||||
|
|
||||||
/*
|
|
||||||
if ((
|
if ((
|
||||||
$action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
|
$action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
|
||||||
$action == "unassigned" || $action == "search"
|
$action == "unassigned" || $action == "search"
|
||||||
)
|
)
|
||||||
&&
|
&&
|
||||||
(($solrConf = System::solrEnv()) !== false)
|
(($solrConf = System::solrEnv()) !== false)
|
||||||
) {
|
|
||||||
*/
|
|
||||||
if ((
|
|
||||||
$action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
|
|
||||||
$action == "unassigned"
|
|
||||||
)
|
|
||||||
&&
|
|
||||||
(($solrConf = System::solrEnv()) !== false)
|
|
||||||
) {
|
) {
|
||||||
G::LoadClass("AppSolr");
|
G::LoadClass("AppSolr");
|
||||||
|
|
||||||
@@ -46,10 +37,6 @@ try {
|
|||||||
$solrConf["solr_instance"]
|
$solrConf["solr_instance"]
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($action == "search") {
|
|
||||||
$userUid = $user;
|
|
||||||
}
|
|
||||||
|
|
||||||
$data = $ApplicationSolrIndex->getAppGridData(
|
$data = $ApplicationSolrIndex->getAppGridData(
|
||||||
$userUid,
|
$userUid,
|
||||||
$start,
|
$start,
|
||||||
|
|||||||
@@ -1454,7 +1454,7 @@ Ext.onReady ( function() {
|
|||||||
value: ''
|
value: ''
|
||||||
});
|
});
|
||||||
|
|
||||||
var optionCategory = (solrConf != true) ? [ _('ID_CATEGORY'), comboCategory, '-'] : [''] ;
|
var optionCategory = (solrEnabled == 1)? [""] : [_("ID_CATEGORY"), comboCategory, "-"];
|
||||||
|
|
||||||
var toolbarTodo = [
|
var toolbarTodo = [
|
||||||
optionMenuOpen,
|
optionMenuOpen,
|
||||||
@@ -1635,6 +1635,8 @@ Ext.onReady ( function() {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
var arrayAux = (solrEnabled == 1)? [""] : ["-", _("ID_USER"), comboUser];
|
||||||
|
|
||||||
var firstToolbarSearch = new Ext.Toolbar({
|
var firstToolbarSearch = new Ext.Toolbar({
|
||||||
region: 'north',
|
region: 'north',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
@@ -1648,9 +1650,7 @@ Ext.onReady ( function() {
|
|||||||
'-',
|
'-',
|
||||||
_('ID_STATUS'),
|
_('ID_STATUS'),
|
||||||
comboStatus,
|
comboStatus,
|
||||||
'-',
|
arrayAux,
|
||||||
_('ID_USER'),
|
|
||||||
comboUser,
|
|
||||||
'-',
|
'-',
|
||||||
textSearch,
|
textSearch,
|
||||||
resetSearchButton,
|
resetSearchButton,
|
||||||
@@ -1893,7 +1893,11 @@ var gridForm = new Ext.FormPanel({
|
|||||||
case "search":
|
case "search":
|
||||||
storeCases.setBaseParam("process", '');
|
storeCases.setBaseParam("process", '');
|
||||||
storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
|
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("search", textSearch.getValue());
|
||||||
storeCases.setBaseParam("dateFrom", dateFrom.getValue());
|
storeCases.setBaseParam("dateFrom", dateFrom.getValue());
|
||||||
storeCases.setBaseParam("dateTo", dateTo.getValue());
|
storeCases.setBaseParam("dateTo", dateTo.getValue());
|
||||||
|
|||||||
Reference in New Issue
Block a user