r25580 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r25579‎ | r25580 | r25581 >
Date:10:41, 6 September 2007
Author:proes
Status:old
Tags:
Comment:
* Solved bug with option attribute values (attribute drop down didn't show options)
* Next step in cleaning up edit page: property to column filters are taken into account now
Modified paths:
  • /trunk/extensions/Wikidata/OmegaWiki/Editor.php (modified) (history)
  • /trunk/extensions/Wikidata/OmegaWiki/OmegaWikiEditors.php (modified) (history)
  • /trunk/extensions/Wikidata/OmegaWiki/PropertyToColumnFilter.php (modified) (history)
  • /trunk/extensions/Wikidata/OmegaWiki/ViewInformation.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Wikidata/OmegaWiki/PropertyToColumnFilter.php
——@@ -2,6 +2,46 @@
33
44 require_once('Attribute.php');
55
 6+interface AttributeIDFilter {
 7+ public function filter(array $attributeIDs);
 8+}
 9+
 10+class IncludeAttributeIDsFilter implements AttributeIDFilter {
 11+ protected $attributeIDsToInclude;
 12+
 13+ public function __construct($attributeIDsToInclude) {
 14+ $this->attributeIDsToInclude = $attributeIDsToInclude;
 15+ }
 16+
 17+ public function filter(array $attributeIDs) {
 18+ $result = array();
 19+
 20+ foreach ($attributeIDs as $attributeID)
 21+ if (in_array($attributeID, $this->attributeIDsToInclude))
 22+ $result[] = $attributeID;
 23+
 24+ return $result;
 25+ }
 26+}
 27+
 28+class ExcludeAttributeIDsFilter implements AttributeIDFilter {
 29+ protected $attributeIDsToExclude;
 30+
 31+ public function __construct($attributeIDsToExclude) {
 32+ $this->attributeIDsToExclude = $attributeIDsToExclude;
 33+ }
 34+
 35+ public function filter(array $attributeIDs) {
 36+ $result = array();
 37+
 38+ foreach ($attributeIDs as $attributeID)
 39+ if (!in_array($attributeID, $this->attributeIDsToExclude))
 40+ $result[] = $attributeID;
 41+
 42+ return $result;
 43+ }
 44+}
 45+
646 class PropertyToColumnFilter {
747 public $attributeIDs; // Array containing the defined meaning ids of the attributes that should be filtered
848 protected $attribute; // Attribute
——@@ -20,6 +60,10 @@
2161 public function getPropertyCaption() {
2262 return $this->propertyCaption;
2363 }
 64+
 65+ public function getAttributeIDFilter() {
 66+ return new IncludeAttributeIDsFilter($this->attributeIDs);
 67+ }
2468 }
2569
2670 ?>
Index: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiEditors.php
——@@ -22,10 +22,12 @@
2323 protected $recordSetTableEditor;
2424 protected $propertyAttribute;
2525 protected $valueAttribute;
 26+ protected $attributeIDFilter;
2627
27 - public function __construct(Attribute $attribute, $propertyCaption, ViewInformation $viewInformation) {
 28+ public function __construct(Attribute $attribute, $propertyCaption, ViewInformation $viewInformation, AttributeIDFilter $attributeIDFilter) {
2829 parent::__construct(new RecordUnorderedListEditor($attribute, 5));
2930
 31+ $this->attributeIDFilter = $attributeIDFilter;
3032 $this->recordSetTableEditor = new RecordSetTableEditor(
3133 $attribute,
3234 new SimplePermissionController(false),
——@@ -48,6 +50,10 @@
4951 addTableMetadataEditors($this->recordSetTableEditor, $viewInformation);
5052 }
5153
 54+ public function getAttributeIDFilter() {
 55+ return $this->attributeIDFilter;
 56+ }
 57+
5258 protected function attributeInStructure(Attribute $attribute, Structure $structure) {
5359 $result = false;
5460 $attributes = $structure->getAttributes();
——@@ -209,14 +215,17 @@
210216 class ShowEditFieldForAttributeValuesChecker extends ShowEditFieldChecker {
211217 protected $levelDefinedMeaningName;
212218 protected $annotationType;
 219+ protected $attributeIDFilter;
213220
214 - public function __construct($levelDefinedMeaningName, $annotationType) {
 221+ public function __construct($levelDefinedMeaningName, $annotationType, AttributeIDFilter $attributeIDFilter) {
215222 $this->levelDefinedMeaningName = $levelDefinedMeaningName;
216223 $this->annotationType = $annotationType;
 224+ $this->attributeIDFilter = $attributeIDFilter;
217225 }
218226
219227 public function check(IdStack $idPath) {
220228 $classAttributes = $idPath->getClassAttributes()->filterClassAttributes($this->levelDefinedMeaningName, $this->annotationType);
 229+ $classAttributes = $this->attributeIDFilter->filter($classAttributes);
221230
222231 return count($classAttributes) > 0;
223232 }
——@@ -240,29 +249,32 @@
241250 foreach ($viewInformation->getPropertyToColumnFilters() as $propertyToColumnFilter) {
242251 $attribute = $propertyToColumnFilter->getAttribute();
243252 $propertyCaption = $propertyToColumnFilter->getPropertyCaption();
 253+ $attributeIDfilter = $propertyToColumnFilter->getAttributeIDFilter();
244254
245 - $textValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation);
246 - $linkValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation);
247 - $translatedTextValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation);
248 - $optionValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation);
 255+ $textValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation, $attributeIDfilter);
 256+ $linkValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation, $attributeIDfilter);
 257+ $translatedTextValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation, $attributeIDfilter);
 258+ $optionValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation, $attributeIDfilter);
249259 }
250260
251 - $textValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation);
252 - $linkValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation);
253 - $translatedTextValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation);
254 - $optionValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation);
 261+ $leftOverAttributeIdFilter = $viewInformation->getLeftOverAttributeFilter();
255262
 263+ $textValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation, $leftOverAttributeIdFilter);
 264+ $linkValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation, $leftOverAttributeIdFilter);
 265+ $translatedTextValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation, $leftOverAttributeIdFilter);
 266+ $optionValueObjectAttributesEditors[] = new ObjectAttributeValuesEditor($o->objectAttributes, $wgPropertyAttributeName, $viewInformation, $leftOverAttributeIdFilter);
 267+
256268 foreach ($textValueObjectAttributesEditors as $textValueObjectAttributesEditor)
257 - addObjectAttributesEditors($textValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->textAttributeId), $annotationMeaningName, new ObjectIdFetcher(1, $o->definedMeaningId));
 269+ addObjectAttributesEditors($textValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->textAttributeId), $annotationMeaningName);
258270
259271 foreach ($linkValueObjectAttributesEditors as $linkValueObjectAttributesEditor)
260 - addObjectAttributesEditors($linkValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->linkAttributeId), $annotationMeaningName, new ObjectIdFetcher(1, $o->definedMeaningId));
 272+ addObjectAttributesEditors($linkValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->linkAttributeId), $annotationMeaningName);
261273
262274 foreach ($translatedTextValueObjectAttributesEditors as $translatedTextValueObjectAttributesEditor)
263 - addObjectAttributesEditors($translatedTextValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->translatedTextAttributeId), $annotationMeaningName, new ObjectIdFetcher(1, $o->definedMeaningId));
 275+ addObjectAttributesEditors($translatedTextValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->translatedTextAttributeId), $annotationMeaningName);
264276
265277 foreach ($optionValueObjectAttributesEditors as $optionValueObjectAttributesEditor)
266 - addObjectAttributesEditors($optionValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->optionAttributeId), $annotationMeaningName, new ObjectIdFetcher(1, $o->definedMeaningId));
 278+ addObjectAttributesEditors($optionValueObjectAttributesEditor, $viewInformation, new ObjectIdFetcher(0, $o->optionAttributeId), $annotationMeaningName);
267279 }
268280
269281 function getTransactionEditor(Attribute $attribute) {
——@@ -328,13 +340,13 @@
329341 $attribute = $propertyToColumnFilter->getAttribute();
330342 $propertyCaption = $propertyToColumnFilter->getPropertyCaption();
331343 $editor->addEditor(new PopUpEditor(
332 - createDefinitionObjectAttributesEditor($viewInformation, $attribute, $propertyCaption, $o->definedMeaningId, $definitionMeaningName),
 344+ createDefinitionObjectAttributesEditor($viewInformation, $attribute, $propertyCaption, $o->definedMeaningId, $definitionMeaningName, $propertyToColumnFilter->getAttributeIDFilter()),
333345 $attribute->name
334346 ));
335347 }
336348
337349 $editor->addEditor(new PopUpEditor(
338 - createDefinitionObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->definedMeaningId, $definitionMeaningName),
 350+ createDefinitionObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->definedMeaningId, $definitionMeaningName, $viewInformation->getLeftOverAttributeFilter()),
339351 $wgPopupAnnotationName
340352 ));
341353
——@@ -347,7 +359,9 @@
348360 foreach ($viewInformation->getPropertyToColumnFilters() as $propertyToColumnFilter) {
349361 $attribute = $propertyToColumnFilter->getAttribute();
350362 $propertyCaption = $propertyToColumnFilter->getPropertyCaption();
351 - $result[] = createObjectAttributesEditor($viewInformation, $attribute, $propertyCaption, $idAttribute, $levelName);
 363+ $attributeIDFilter = $propertyToColumnFilter->getAttributeIDFilter();
 364+
 365+ $result[] = createObjectAttributesEditor($viewInformation, $attribute, $propertyCaption, $idAttribute, $levelName, $attributeIDFilter);
352366 }
353367
354368 return $result;
——@@ -378,17 +392,19 @@
379393 return $editor;
380394 }
381395
382 -function addObjectAttributesEditors(Editor $objectAttributesEditor, ViewInformation $viewInformation, ContextFetcher $annotatedObjectIdFetcher, $annotationLevelName) {
383 - $objectAttributesEditor->addEditor(getTextAttributeValuesEditor($viewInformation, new TextAttributeValuesController($annotatedObjectIdFetcher), $annotationLevelName));
384 - $objectAttributesEditor->addEditor(getTranslatedTextAttributeValuesEditor($viewInformation, new TranslatedTextAttributeValuesController($annotatedObjectIdFetcher, $viewInformation->filterLanguageId), $annotationLevelName));
385 - $objectAttributesEditor->addEditor(getLinkAttributeValuesEditor($viewInformation, new LinkAttributeValuesController($annotatedObjectIdFetcher), $annotationLevelName));
386 - $objectAttributesEditor->addEditor(getOptionAttributeValuesEditor($viewInformation, new OptionAttributeValuesController($annotatedObjectIdFetcher), $annotationLevelName));
 396+function addObjectAttributesEditors(ObjectAttributeValuesEditor $objectAttributesEditor, ViewInformation $viewInformation, ContextFetcher $annotatedObjectIdFetcher, $annotationLevelName) {
 397+ $attributeIDFilter = $objectAttributesEditor->getAttributeIDfilter();
 398+
 399+ $objectAttributesEditor->addEditor(getTextAttributeValuesEditor($viewInformation, new TextAttributeValuesController($annotatedObjectIdFetcher), $annotationLevelName, $attributeIDFilter));
 400+ $objectAttributesEditor->addEditor(getTranslatedTextAttributeValuesEditor($viewInformation, new TranslatedTextAttributeValuesController($annotatedObjectIdFetcher, $viewInformation->filterLanguageId), $annotationLevelName, $attributeIDFilter));
 401+ $objectAttributesEditor->addEditor(getLinkAttributeValuesEditor($viewInformation, new LinkAttributeValuesController($annotatedObjectIdFetcher), $annotationLevelName, $attributeIDFilter));
 402+ $objectAttributesEditor->addEditor(getOptionAttributeValuesEditor($viewInformation, new OptionAttributeValuesController($annotatedObjectIdFetcher), $annotationLevelName, $attributeIDFilter));
387403 }
388404
389 -function createObjectAttributesEditor(ViewInformation $viewInformation, Attribute $attribute, $propertyCaption, Attribute $idAttribute, $levelName) {
 405+function createObjectAttributesEditor(ViewInformation $viewInformation, Attribute $attribute, $propertyCaption, Attribute $idAttribute, $levelName, AttributeIDFilter $attributeIDFilter) {
390406 $o=OmegaWikiAttributes::getInstance();
391407
392 - $result = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation);
 408+ $result = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation, $attributeIDFilter);
393409
394410 addObjectAttributesEditors(
395411 $result,
——@@ -400,10 +416,10 @@
401417 return $result;
402418 }
403419
404 -function createDefinitionObjectAttributesEditor(ViewInformation $viewInformation, Attribute $attribute, $propertyCaption, Attribute $idAttribute, $levelName) {
 420+function createDefinitionObjectAttributesEditor(ViewInformation $viewInformation, Attribute $attribute, $propertyCaption, Attribute $idAttribute, $levelName, AttributeIDFilter $attributeIDFilter) {
405421 $o=OmegaWikiAttributes::getInstance();
406422
407 - $result = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation);
 423+ $result = new ObjectAttributeValuesEditor($attribute, $propertyCaption, $viewInformation, $attributeIDFilter);
408424
409425 addObjectAttributesEditors(
410426 $result,
——@@ -491,7 +507,7 @@
492508 addPropertyToColumnFilterEditors($tableEditor, $viewInformation, $o->syntransId, $synTransMeaningName);
493509
494510 $tableEditor->addEditor(new PopUpEditor(
495 - createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->syntransId, $synTransMeaningName),
 511+ createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->syntransId, $synTransMeaningName, $viewInformation->getLeftOverAttributeFilter()),
496512 $wgPopupAnnotationName
497513 ));
498514
——@@ -514,7 +530,7 @@
515531 addPropertyToColumnFilterEditors($editor, $viewInformation, $o->relationId, $relationMeaningName);
516532
517533 $editor->addEditor(new PopUpEditor(
518 - createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->relationId, $relationMeaningName),
 534+ createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->relationId, $relationMeaningName, $viewInformation->getLeftOverAttributeFilter()),
519535 $wgPopupAnnotationName
520536 ));
521537
——@@ -537,7 +553,7 @@
538554 addPropertyToColumnFilterEditors($editor, $viewInformation, $o->relationId, $relationMeaningName);
539555
540556 $editor->addEditor(new PopUpEditor(
541 - createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->relationId, $relationMeaningName),
 557+ createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->relationId, $relationMeaningName, $viewInformation->getLeftOverAttributeFilter()),
542558 $wgPopupAnnotationName
543559 ));
544560
——@@ -604,13 +620,13 @@
605621 $editor->addEditor(new PopUpEditor($columnEditor, $columnEditor->getAttribute()->name));
606622 }
607623
608 -function getTextAttributeValuesEditor(ViewInformation $viewInformation, $controller, $levelDefinedMeaningName) {
 624+function getTextAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName, AttributeIDFilter $attributeIDFilter) {
609625 global
610626 $textValueObjectAttributesEditors;
611627
612628 $o=OmegaWikiAttributes::getInstance();
613629
614 - $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "TEXT");
 630+ $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "TEXT", $attributeIDFilter);
615631
616632 $editor = new RecordSetTableEditor($o->textAttributeValues, new SimplePermissionController(true), $showEditFieldChecker, new AllowAddController(true), true, false, $controller);
617633 $editor->addEditor(new TextAttributeEditor($o->textAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName));
——@@ -622,13 +638,13 @@
623639 return $editor;
624640 }
625641
626 -function getLinkAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName) {
 642+function getLinkAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName, AttributeIDFilter $attributeIDFilter) {
627643 global
628644 $linkValueObjectAttributesEditors;
629645
630646 $o=OmegaWikiAttributes::getInstance();
631647
632 - $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "URL");
 648+ $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "URL", $attributeIDFilter);
633649
634650 $editor = new RecordSetTableEditor($o->linkAttributeValues, new SimplePermissionController(true), $showEditFieldChecker, new AllowAddController(true), true, false, $controller);
635651 $editor->addEditor(new LinkAttributeEditor($o->linkAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName));
——@@ -649,13 +665,13 @@
650666 return $editor;
651667 }
652668
653 -function getTranslatedTextAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName) {
 669+function getTranslatedTextAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName, AttributeIDFilter $attributeIDFilter) {
654670 global
655671 $translatedTextValueObjectAttributesEditors;
656672
657673 $o=OmegaWikiAttributes::getInstance();
658674
659 - $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "TRNS");
 675+ $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "TRNS", $attributeIDFilter);
660676
661677 $editor = new RecordSetTableEditor($o->translatedTextAttributeValues, new SimplePermissionController(true), $showEditFieldChecker, new AllowAddController(true), true, false, $controller);
662678 $editor->addEditor(new TranslatedTextAttributeEditor($o->translatedTextAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName));
——@@ -672,16 +688,15 @@
673689 return $editor;
674690 }
675691
676 -function getOptionAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName) {
 692+function getOptionAttributeValuesEditor(ViewInformation $viewInformation, UpdateController $controller, $levelDefinedMeaningName, AttributeIDFilter $attributeIDFilter) {
677693 global
678694 $optionValueObjectAttributesEditors;
679695
680696 $o=OmegaWikiAttributes::getInstance();
681697
682 - $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "OPTN");
 698+ $showEditFieldChecker = new ShowEditFieldForAttributeValuesChecker($levelDefinedMeaningName, "OPTN", $attributeIDFilter);
683699
684700 $editor = new RecordSetTableEditor($o->optionAttributeValues, new SimplePermissionController(true), $showEditFieldChecker, new AllowAddController(true), true, false, $controller);
685 -
686701 $editor->addEditor(new OptionAttributeEditor($o->optionAttribute, new SimplePermissionController(false), true, $levelDefinedMeaningName));
687702 $editor->addEditor(new OptionSelectEditor($o->optionAttributeOption, new SimplePermissionController(false), true));
688703
——@@ -787,7 +802,7 @@
788803 $o->possibleSynonym,
789804 $viewInformation->possiblySynonymousRelationTypeId,
790805 $viewInformation,
791 - createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->possiblySynonymousId, $relationMeaningName)
 806+ createObjectAttributesEditor($viewInformation, $o->objectAttributes, $wgPropertyAttributeName, $o->possiblySynonymousId, $relationMeaningName, $viewInformation->getLeftOverAttributeFilter())
792807 );
793808
794809 $availableEditors = new AttributeEditorMap();
——@@ -803,7 +818,7 @@
804819 foreach (createPropertyToColumnFilterEditors($viewInformation, $o->definedMeaningId, $definedMeaningMeaningName) as $propertyToColumnEditor)
805820 $availableEditors->addEditor($propertyToColumnEditor);
806821
807 - $availableEditors->addEditor(createObjectAttributesEditor($viewInformation, $o->definedMeaningAttributes, $wgPropertyAttributeName, $o->definedMeaningId, $definedMeaningMeaningName));
 822+ $availableEditors->addEditor(createObjectAttributesEditor($viewInformation, $o->definedMeaningAttributes, $wgPropertyAttributeName, $o->definedMeaningId, $definedMeaningMeaningName, $viewInformation->getLeftOverAttributeFilter()));
808823
809824 if ($viewInformation->possiblySynonymousRelationTypeId != 0)
810825 $availableEditors->addEditor($possiblySynonymousEditor);
Index: trunk/extensions/Wikidata/OmegaWiki/ViewInformation.php
——@@ -44,6 +44,15 @@
4545 public function getPropertyToColumnFilters() {
4646 return $this->propertyToColumnFilters;
4747 }
 48+
 49+ public function getLeftOverAttributeFilter() {
 50+ $allFilteredAttributeIds = array();
 51+
 52+ foreach ($this->getPropertyToColumnFilters() as $propertyToColumnFilter)
 53+ $allFilteredAttributeIds = array_merge($allFilteredAttributeIds, $propertyToColumnFilter->attributeIDs);
 54+
 55+ return new ExcludeAttributeIDsFilter($allFilteredAttributeIds);
 56+ }
4857
4958 /* make an attempt at a hashCode function.
5059 * note that this function is imperfect..., I've left out
Index: trunk/extensions/Wikidata/OmegaWiki/Editor.php
——@@ -1347,6 +1347,7 @@
13481348 $parameters = array(
13491349 "level" => $this->attributesLevelName,
13501350 "definedMeaningId" => $idPath->getDefinedMeaningId(),
 1351+ "annotationAttributeId" => $idPath->getAnnotationAttribute()->getId(),
13511352 "onUpdate" => 'updateSelectOptions(\'' . $this->addId($idPath->getId()) . '-option\',' . $syntransId
13521353 );
13531354 return getSuggest($this->addId($idPath->getId()), $this->suggestType(), $parameters);

Status & tagging log