Index: branches/unlabeled/unlabeled-1.6.2/kernel/units/relationship/relationship_event_handler.php =================================================================== diff -u -r5757 -r5795 --- branches/unlabeled/unlabeled-1.6.2/kernel/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 5757) +++ branches/unlabeled/unlabeled-1.6.2/kernel/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 5795) @@ -10,71 +10,108 @@ { parent::mapPermissions(); $permissions = Array( - 'OnAddRelation' => Array('subitem' => 'add|edit'), + 'OnProcessSelected' => Array('subitem' => 'add|edit'), ); $this->permMapping = array_merge($this->permMapping, $permissions); } /** - * Add new relation + * Initializes new relation * * @param kEvent $event */ - function OnAddRelation(&$event) + function OnNew(&$event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); - + parent::OnNew(&$event); + + $object =& $event->getObject(); $table_info = $object->getLinkedInfo(); - $main_item_type = $this->Application->getUnitOption($table_info['ParentPrefix'],'ItemType'); - - $target['id'] = $this->Application->GetVar('TargetId'); - $target['type'] = $this->Application->GetVar('TargetType'); - - - $object->SetDBField($table_info['ForeignKey'], $table_info['ParentId']); - $object->SetDBField('SourceType', $main_item_type); - $object->SetDBField('TargetId', $target['id']); - $object->SetDBField('TargetType', $target['type']); - - // 1. get item info used in relation - $configs = $this->extractModulesInfo(); - foreach($configs as $prefix => $config_data) - { - if ($config_data['ItemType'] == $target['type']) { - if ($prefix == 'm') $prefix = 'c'; - break; + + $object->SetDBField('SourceId', $table_info['ParentId']); + $source_itemtype = $this->Application->getUnitOption($table_info['ParentPrefix'], 'ItemType'); + $object->SetDBField('SourceType', $source_itemtype); + + $object->SetDBField('TargetId', $this->Application->GetVar('target_id')); + $object->SetDBField('TargetType', $this->Application->GetVar('target_type')); + + $this->OnAfterItemLoad($event); + } + + /** + * Add new relation + * + * @param kEvent $event + */ + function OnProcessSelected(&$event) + { + $dst_field = $this->Application->RecallVar('dst_field'); + if ($dst_field == 'TargetId') { + // prepare target_id & target_type + $object =& $event->getObject( Array('skip_autoload' => true) ); + + $selected_ids = $this->Application->GetVar('selected_ids'); + $target_prefix = false; + foreach ($selected_ids as $selected_prefix => $target_id) { + if ($target_id > 0) { + $target_prefix = $selected_prefix; + break; + } } + + $sql = 'SELECT ResourceId + FROM '.$this->Application->getUnitOption($target_prefix, 'TableName').' + WHERE '.$this->Application->getUnitOption($target_prefix, 'IDField').' = '.$target_id; + $target_id = $this->Conn->GetOne($sql); + $target_type = $this->Application->getUnitOption($target_prefix, 'ItemType'); + + // don't add same relation twice + $table_info = $object->getLinkedInfo(); + $sql = 'SELECT TargetId + FROM '.$object->TableName.' + WHERE (SourceId = '.$table_info['ParentId'].') AND (TargetId = '.$target_id.')'; + $duplicate_relation = $this->Conn->GetOne($sql) == $target_id; + + $this->finalizePopup($event); + + if (!$duplicate_relation) { + // place correct template in opener stack + $source_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); + $template = $this->Application->getUnitOption($source_prefix, 'AdminTemplatePath').'/relations_edit'; + $redirect_params = Array($event->Prefix.'_event' => 'OnNew', 'target_id' => $target_id, 'target_type' => $target_type); + $this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,'.$event->Prefix); + } } - - // this forces prepareOptions of kMultiLanguge formatter to substiture title field (if multilingual) of target item - // BUT this is not the solution, find out another way to get correct title field here - - $target_object =& $this->Application->recallObject($prefix, null, Array('skip_autoload' => true)); - $title_field = $this->Application->getUnitOption($prefix, 'TitleField'); - - $item['name'] = $this->Conn->GetOne('SELECT '.$title_field.' FROM '.$config_data['TableName'].' WHERE ResourceId = '.$target['id']); - $item['type'] = $this->Application->Phrase($config_data['TitlePhrase']); - $object->SetDBField('ItemName', $item['name']); - $object->SetDBField('ItemType', $item['type']); - - $object->setID(0); - - $event->redirect = false; - - // 2. substitute opener - $opener_stack = $this->Application->RecallVar('opener_stack'); - $opener_stack = $opener_stack ? unserialize($opener_stack) : Array(); - array_pop($opener_stack); - - $return_template = $this->Application->RecallVar('return_template'); - $new_level = 'index.php|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'='); - array_push($opener_stack,$new_level); - $this->Application->StoreVar('opener_stack',serialize($opener_stack)); - - $this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate'); + else { + $this->finalizePopup($event); + } } /** + * Set ItemName & ItemType virtual fields based on loaded item data + * + * @param kEvent $event + */ + function OnAfterItemLoad(&$event) + { + $object =& $event->getObject(); + + $sql = 'SELECT Prefix + FROM '.TABLE_PREFIX.'ItemTypes + WHERE ItemType = '.$object->GetDBField('TargetType'); + $target_prefix = $this->Conn->GetOne($sql); + + $title_field = $this->getTitleField($target_prefix); + $title_phrase = $this->Application->getUnitOption($target_prefix, 'TitlePhrase'); + + $sql = 'SELECT '.$title_field.' + FROM '.$this->Application->getUnitOption($target_prefix, 'TableName').' + WHERE ResourceId = '.$object->GetDBField('TargetId'); + + $object->SetDBField('ItemName', $this->Conn->GetOne($sql)); + $object->SetDBField('ItemType', $this->Application->Phrase($title_phrase)); + } + + /** * Creates needed sql query to load list, * if no query is defined in config for * special requested, then use default @@ -85,7 +122,7 @@ */ function ListPrepareQuery(&$event) { - return $this->BaseQuery($event,'ListSQLs'); + return $this->BaseQuery($event, 'ListSQLs'); } /** @@ -99,7 +136,7 @@ */ function ItemPrepareQuery(&$event) { - return $this->BaseQuery($event,'ItemSQLs'); + return $this->BaseQuery($event, 'ItemSQLs'); } @@ -124,14 +161,7 @@ $sql_parts = Array(); $sql_parts['TargetName'] = "''"; foreach ($configs as $prefix => $config_data) { - // convert TitleField field of kMultiLanguage formatter used for it: begin - $title_field = $config_data['TitleField']; - $formatter_class = isset($config_data['Fields'][$title_field]['formatter']) ? $config_data['Fields'][$title_field]['formatter'] : ''; - if ($formatter_class == 'kMultiLanguage') { - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); - $title_field = $ml_formatter->LangFieldName($title_field); - } - // convert TitleField field of kMultiLanguage formatter used for it: end + $title_field = $this->getTitleField($prefix); $sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $config_data['TableName'], $title_field); $sql_parts['TableJoin'][] = sprintf($sql_templates['TableJoin'], $config_data['TableName']); @@ -162,6 +192,26 @@ } /** + * Convert TitleField field of kMultiLanguage formatter used for it + * + * @param string $prefix + * @return string + */ + function getTitleField($prefix) + { + $lang_prefix = 'l'.$this->Application->GetVar('m_lang').'_'; + + $title_field = $this->Application->getUnitOption($prefix, 'TitleField'); + $field_options = $this->Application->getUnitOption($prefix.'.'.$title_field, 'Fields'); + + $formatter_class = isset($field_options['formatter']) ? $field_options['formatter'] : ''; + if ($formatter_class == 'kMultiLanguage' && !isset($field_options['master_field'])) { + $title_field = $lang_prefix.$title_field; + } + return $title_field; + } + + /** * Get configs from modules installed * * @return Array @@ -174,14 +224,16 @@ $configs = Array(); foreach ($this->Application->ModuleInfo as $module_name => $module_data) { $prefix = $module_data['Var']; + if ($prefix == 'm') { + $prefix = 'c'; + } $configs[$prefix] = $this->Application->getUnitOptions($prefix); if($configs[$prefix] === false) unset($configs[$prefix]); if(!isset($configs[$prefix]['CatalogItem']) || !$configs[$prefix]['CatalogItem']) unset($configs[$prefix]); } return $configs; } - /** * Deletes relations to hooked item from other items *