Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F803271
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Tue, Feb 25, 8:19 AM
Size
4 KB
Mime Type
text/x-diff
Expires
Thu, Feb 27, 8:19 AM (21 h, 52 m)
Engine
blob
Format
Raw Data
Handle
576116
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/RC/core/units/config_search/config_search_event_handler.php
===================================================================
--- branches/RC/core/units/config_search/config_search_event_handler.php (revision 11852)
+++ branches/RC/core/units/config_search/config_search_event_handler.php (revision 11853)
@@ -1,109 +1,112 @@
<?php
class ConfigSearchEventHandler extends kDBEventHandler {
/**
* Changes permission section to one from REQUEST, not from config
*
* @param kEvent $event
*/
function CheckPermission(&$event)
{
$module = $this->Application->GetVar('module');
$main_prefix = $this->Application->findModule('Name', $module, 'Var');
$section = $this->Application->getUnitOption($main_prefix.'.search', 'PermSection');
$event->setEventParam('PermSection', $section);
return parent::CheckPermission($event);
}
/**
* Apply any custom changes to list's sql query
*
* @param kEvent $event
* @access protected
* @see OnListBuild
*/
function SetCustomQuery(&$event)
{
$object =& $event->getObject();
// show only items that belong to selected module
$module = $this->Application->GetVar('module');
$object->addFilter('module_filter', '%1$s.ModuleName = '.$this->Conn->qstr($module));
// don't show disabled search items
$object->addFilter('active_filter', '%1$s.SimpleSearch <> -1');
}
/**
* Enter description here...
*
* @param kEvent $event
*/
function OnUpdate(&$event)
{
if (!$this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
parent::OnUpdate($event);
$conf_update = new kEvent('conf:OnUpdate');
$conf_update->redirect = false;
$this->Application->HandleEvent($conf_update);
}
$event->SetRedirectParam('opener', 's');
// keeps module and section in REQUEST to ensure, that last admin template will work
$event->SetRedirectParam('module', $this->Application->GetVar('module'));
$event->SetRedirectParam('module_key', $this->Application->GetVar('module_key'));
$event->SetRedirectParam('section', $this->Application->GetVar('section'));
}
function OnCancel(&$event)
{
parent::OnCancel($event);
$event->SetRedirectParam('opener', 's');
}
/**
* [HOOK] Enter description here...
*
* @param kEvent $event
*/
function OnCreateCustomField(&$event)
{
$custom_field =& $event->MasterEvent->getObject();
if ($custom_field->GetDBField('Type') == 6 || $custom_field->GetDBField('IsSystem') == 1) {
// user & system custom fields are not searchable
return false;
}
$object =& $event->getObject( Array('skip_autoload' => true) );
$custom_id = $custom_field->GetID();
- if ($object->GetDBField('CustomFieldId') != $custom_id) {
+ if (!$object->isLoaded() || ($object->GetDBField('CustomFieldId') != $custom_id)) {
$object->Load($custom_id, 'CustomFieldId');
}
$cf_search = Array();
- $cf_search['DisplayOrder'] = $custom_field->GetDBField('DisplayOrder');
- $cf_search['FieldType'] = $custom_field->GetDBField('ElementType');
- $cf_search['DisplayName'] = $custom_field->GetDBField('FieldLabel');
- $cf_search['FieldName'] = $custom_field->GetDBField('FieldName');
- $cf_search['Description'] = $custom_field->GetDBField('Prompt');
- $cf_search['ConfigHeader'] = $custom_field->GetDBField('Heading'); // 'la_Text_CustomFields';
- $cf_search['TableName'] = 'CustomField';
+ $element_type = $custom_field->GetDBField('ElementType');
+
+ $cf_search['DisplayOrder'] = $custom_field->GetDBField('DisplayOrder');
+ $cf_search['FieldType'] = $element_type;
+ $cf_search['DisplayName'] = $custom_field->GetDBField('FieldLabel');
+ $cf_search['FieldName'] = $custom_field->GetDBField('FieldName');
+ $cf_search['Description'] = $custom_field->GetDBField('Prompt');
+ $cf_search['ConfigHeader'] = $custom_field->GetDBField('Heading'); // 'la_Text_CustomFields';
+ $cf_search['SimpleSearch'] = in_array($element_type, Array ('text', 'range', 'select', 'multiselect')) ? 1 : 0;
+ $cf_search['TableName'] = 'CustomField';
$sql = 'SELECT Module
FROM '.TABLE_PREFIX.'ItemTypes
WHERE ItemType = '.$custom_field->GetDBField('Type');
$cf_search['ModuleName'] = $this->Conn->GetOne($sql);
$object->SetFieldsFromHash($cf_search);
$object->SetDBField('CustomFieldId', $custom_id);
$result = $object->isLoaded() ? $object->Update() : $object->Create();
}
}
?>
\ No newline at end of file
Event Timeline
Log In to Comment