| Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiEditors.php |
| — | — | @@ -90,14 +90,11 @@ |
| 91 | 91 | return $editor; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | | -function addPropertyToColumnFilterEditors(Editor $editor, ViewInformation $viewInformation, $levelsFromDefinedMeaning, $levelName) { |
| 95 | | - global |
| 96 | | - $definedMeaningIdAttribute; |
| 97 | | - |
| | 94 | +function addPropertyToColumnFilterEditors(Editor $editor, ViewInformation $viewInformation, Attribute $idAttribute, $levelsFromDefinedMeaning, $levelName) { |
| 98 | 95 | foreach ($viewInformation->getPropertyToColumnFilters() as $propertyToColumnFilter) { |
| 99 | 96 | $attribute = $propertyToColumnFilter->getAttribute(); |
| 100 | 97 | $editor->addEditor(new PopUpEditor( |
| 101 | | - createObjectAttributesEditor($viewInformation, $attribute, $definedMeaningIdAttribute, $levelsFromDefinedMeaning, $levelName), |
| | 98 | + createObjectAttributesEditor($viewInformation, $attribute, $idAttribute, $levelsFromDefinedMeaning, $levelName), |
| 102 | 99 | $attribute->name |
| 103 | 100 | )); |
| 104 | 101 | } |
| — | — | @@ -239,7 +236,7 @@ |
| 240 | 237 | $tableEditor->addEditor(getExpressionTableCellEditor($expressionAttribute, $viewInformation)); |
| 241 | 238 | $tableEditor->addEditor(new BooleanEditor($identicalMeaningAttribute, new SimplePermissionController(true), true, true)); |
| 242 | 239 | |
| 243 | | - addPropertyToColumnFilterEditors($tableEditor, $viewInformation, 1, $synTransMeaningName); |
| | 240 | + addPropertyToColumnFilterEditors($tableEditor, $viewInformation, $syntransIdAttribute, 1, $synTransMeaningName); |
| 244 | 241 | |
| 245 | 242 | $tableEditor->addEditor(new PopUpEditor( |
| 246 | 243 | createObjectAttributesEditor($viewInformation, $objectAttributesAttribute, $syntransIdAttribute, 1, $synTransMeaningName), |
| — | — | @@ -260,7 +257,7 @@ |
| 261 | 258 | $editor->addEditor(new RelationTypeReferenceEditor($relationTypeAttribute, new SimplePermissionController(false), true)); |
| 262 | 259 | $editor->addEditor(new DefinedMeaningReferenceEditor($otherDefinedMeaningAttribute, new SimplePermissionController(false), true)); |
| 263 | 260 | |
| 264 | | - addPropertyToColumnFilterEditors($editor, $viewInformation, 1, $relationMeaningName); |
| | 261 | + addPropertyToColumnFilterEditors($editor, $viewInformation, $relationIdAttribute, 1, $relationMeaningName); |
| 265 | 262 | |
| 266 | 263 | $editor->addEditor(new PopUpEditor( |
| 267 | 264 | createObjectAttributesEditor($viewInformation, $objectAttributesAttribute, $relationIdAttribute, 1, $relationMeaningName), |
| — | — | @@ -281,7 +278,7 @@ |
| 282 | 279 | $editor->addEditor(new DefinedMeaningReferenceEditor($otherDefinedMeaningAttribute, new SimplePermissionController(false), true)); |
| 283 | 280 | $editor->addEditor(new RelationTypeReferenceEditor($relationTypeAttribute, new SimplePermissionController(false), true)); |
| 284 | 281 | |
| 285 | | - addPropertyToColumnFilterEditors($editor, $viewInformation, 1, $relationMeaningName); |
| | 282 | + addPropertyToColumnFilterEditors($editor, $viewInformation, $relationIdAttribute, 1, $relationMeaningName); |
| 286 | 283 | |
| 287 | 284 | $editor->addEditor(new PopUpEditor( |
| 288 | 285 | createObjectAttributesEditor($viewInformation, $objectAttributesAttribute, $relationIdAttribute, 1, $relationMeaningName), |