| Index: trunk/extensions/Wikidata/OmegaWiki/DefinedMeaning.php |
| — | — | @@ -16,6 +16,7 @@ |
| 17 | 17 | |
| 18 | 18 | $definedMeaningId = $this->getDefinedMeaningIdFromTitle($wgTitle->getText()); |
| 19 | 19 | |
| | 20 | + $wgOut->addHTML($this->getConceptPanel()); |
| 20 | 21 | $wgOut->addHTML( |
| 21 | 22 | getDefinedMeaningEditor( |
| 22 | 23 | $this->filterLanguageId, $this->possiblySynonymousRelationTypeId, false, $this->shouldShowAuthorities)->view( |
| — | — | @@ -130,6 +131,8 @@ |
| 131 | 132 | } |
| 132 | 133 | |
| 133 | 134 | public function getDefinedMeaningId() { |
| | 135 | + global |
| | 136 | + $wgTitle; |
| 134 | 137 | return $this->getDefinedMeaningIdFromTitle($wgTitle->getText()); |
| 135 | 138 | } |
| 136 | 139 | /** cut and paste getDataSetPanel with mods for Collection instead |
| — | — | @@ -137,6 +140,7 @@ |
| 138 | 141 | */ |
| 139 | 142 | protected function getConceptPanel() { |
| 140 | 143 | global $wgTitle, $wgUser; |
| | 144 | + $active=True; # wrong place, but hey |
| 141 | 145 | $dm=$this->getDefinedMeaningId(); |
| 142 | 146 | $dc=wdGetDataSetContext(); |
| 143 | 147 | $ow_conceptpanel="Concept Panel"; |
| — | — | @@ -156,6 +160,7 @@ |
| 157 | 161 | } |
| 158 | 162 | $html.="</table>"; |
| 159 | 163 | $html.="</div>"; |
| | 164 | + #$html="bla\n"; |
| 160 | 165 | return $html; |
| 161 | 166 | } |
| 162 | 167 | } |
| Index: trunk/extensions/Wikidata/OmegaWiki/WikiDataAPI.php |
| — | — | @@ -1165,12 +1165,14 @@ |
| 1166 | 1166 | if(is_null($dc)) { |
| 1167 | 1167 | $dc=wdGetDataSetContext(); |
| 1168 | 1168 | } |
| | 1169 | + $collection_id=getCollectionIdForDC($dc); |
| 1169 | 1170 | $dbr = & wfGetDB(DB_SLAVE); |
| 1170 | 1171 | $dm=$dbr->addQuotes($dm); |
| 1171 | 1172 | $query = " |
| 1172 | 1173 | SELECT internal_member_id AS concept_id |
| 1173 | 1174 | FROM {$dc}_collection_contents |
| 1174 | 1175 | WHERE member_mid=$dm |
| | 1176 | + AND collection_id=$collection_id; |
| 1175 | 1177 | "; |
| 1176 | 1178 | wfDebug($query); |
| 1177 | 1179 | $queryResult = $dbr->query($query); |