[MediaWiki-commits] [Gerrit] oops forgot to update updateSelectOptions - change (mediawiki...WikiLexicalData)
Kipcool has uploaded a new change for review.
https://gerrit.wikimedia.org/r/50934
Change subject: oops forgot to update updateSelectOptions
..
oops forgot to update updateSelectOptions
Change-Id: I02661683088e287e70de53a05cfd2b94bbf1df14
---
M OmegaWiki/Editor.php
M OmegaWiki/SpecialSelect.php
2 files changed, 18 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/34/50934/1
diff --git a/OmegaWiki/Editor.php b/OmegaWiki/Editor.php
index c3349db..c3d3732 100644
--- a/OmegaWiki/Editor.php
+++ b/OmegaWiki/Editor.php
@@ -1778,7 +1778,7 @@
level = $this-attributesLevelName,
definedMeaningId =
$idPath-getDefinedMeaningId(),
annotationAttributeId =
$idPath-getAnnotationAttribute()-getId(),
- onUpdate = 'updateSelectOptions(\'' .
$this-addId( $idPath-getId() ) . WLD_OPTION_SUFFIX . '\',' . $syntransId
+ onUpdate = updateSelectOptions(' .
$this-addId( $idPath-getId() ) . WLD_OPTION_SUFFIX . ',0
);
if ( $this-attributesLevelName ==
WLD_SYNTRANS_MEANING_NAME ) {
@@ -1790,6 +1790,7 @@
}
if ( $syntransId != ) {
$parameters[syntransId] = $syntransId;
+ $parameters[onUpdate] =
'updateSelectOptions(\'' . $this-addId( $idPath-getId() ) . WLD_OPTION_SUFFIX
. '\',' . $syntransId ;
}
}
diff --git a/OmegaWiki/SpecialSelect.php b/OmegaWiki/SpecialSelect.php
index 55c8cbd..b8bf5fd 100644
--- a/OmegaWiki/SpecialSelect.php
+++ b/OmegaWiki/SpecialSelect.php
@@ -19,20 +19,24 @@
$dc = wdGetDataSetContext();
$optionAttribute = $wgRequest-getVal( WLD_OPTION_ATTRIBUTE );
- $attributeObject = $wgRequest-getVal( 'attribute-object' );
+ $attributeObject = $wgRequest-getVal( 'attribute-object', 0 );
$lang_code = $wgLang-getCode();
$dbr = wfGetDB( DB_SLAVE );
- $sql = 'SELECT language_id' .
-FROM {$dc}_syntrans .
-JOIN {$dc}_expression ON
{$dc}_expression.expression_id = {$dc}_syntrans.expression_id .
-WHERE {$dc}_syntrans.syntrans_sid = .
$attributeObject .
- ' AND ' . getLatestTransactionRestriction(
{$dc}_syntrans ) .
- ' AND ' . getLatestTransactionRestriction(
{$dc}_expression );
- $lang_res = $dbr-query( $sql );
- $objectLanguage = $dbr-fetchObject( $lang_res )-language_id;
- // language is not always defined, for example for a DM Option
Attribute
- if ( ! $objectLanguage ) $objectLanguage = 0 ;
+
+ $objectLanguage = 0 ;
+ if ( $attributeObject != 0 ) {
+ $sql = 'SELECT language_id' .
+FROM {$dc}_syntrans .
+JOIN {$dc}_expression ON
{$dc}_expression.expression_id = {$dc}_syntrans.expression_id .
+WHERE {$dc}_syntrans.syntrans_sid =
. $attributeObject .
+ ' AND ' .
getLatestTransactionRestriction( {$dc}_syntrans ) .
+ ' AND ' .
getLatestTransactionRestriction( {$dc}_expression );
+ $lang_res = $dbr-query( $sql );
+ $objectLanguage = $dbr-fetchObject( $lang_res
)-language_id;
+ // language is not always defined, for example for a DM
Option Attribute
+ if ( ! $objectLanguage ) $objectLanguage = 0 ;
+ }
$sql = SELECT
{$dc}_option_attribute_options.option_id,{$dc}_option_attribute_options.option_mid
.
FROM {$dc}_option_attribute_options .
@@ -67,7 +71,7 @@
' AND ' .
getLatestTransactionRestriction( {$dc}_syntrans ) .
' AND ' .
getLatestTransactionRestriction( {$dc}_expression );
$res = $dbr-query( $sql );
- if ( !$dbr-fetchObject( $res )-spelling )
+ if ( !$dbr-fetchObject( $res ) )
$sql = SELECT
{$dc}_expression.spelling .
FROM {$dc}_syntrans .
JOIN {$dc}_expression
ON {$dc}_expression.expression_id =
[MediaWiki-commits] [Gerrit] oops forgot to update updateSelectOptions - change (mediawiki...WikiLexicalData)
Kipcool has submitted this change and it was merged.
Change subject: oops forgot to update updateSelectOptions
..
oops forgot to update updateSelectOptions
Change-Id: I02661683088e287e70de53a05cfd2b94bbf1df14
---
M OmegaWiki/Editor.php
M OmegaWiki/SpecialSelect.php
2 files changed, 18 insertions(+), 13 deletions(-)
Approvals:
Kipcool: Verified; Looks good to me, approved
diff --git a/OmegaWiki/Editor.php b/OmegaWiki/Editor.php
index c3349db..c3d3732 100644
--- a/OmegaWiki/Editor.php
+++ b/OmegaWiki/Editor.php
@@ -1778,7 +1778,7 @@
level = $this-attributesLevelName,
definedMeaningId =
$idPath-getDefinedMeaningId(),
annotationAttributeId =
$idPath-getAnnotationAttribute()-getId(),
- onUpdate = 'updateSelectOptions(\'' .
$this-addId( $idPath-getId() ) . WLD_OPTION_SUFFIX . '\',' . $syntransId
+ onUpdate = updateSelectOptions(' .
$this-addId( $idPath-getId() ) . WLD_OPTION_SUFFIX . ',0
);
if ( $this-attributesLevelName ==
WLD_SYNTRANS_MEANING_NAME ) {
@@ -1790,6 +1790,7 @@
}
if ( $syntransId != ) {
$parameters[syntransId] = $syntransId;
+ $parameters[onUpdate] =
'updateSelectOptions(\'' . $this-addId( $idPath-getId() ) . WLD_OPTION_SUFFIX
. '\',' . $syntransId ;
}
}
diff --git a/OmegaWiki/SpecialSelect.php b/OmegaWiki/SpecialSelect.php
index 55c8cbd..b8bf5fd 100644
--- a/OmegaWiki/SpecialSelect.php
+++ b/OmegaWiki/SpecialSelect.php
@@ -19,20 +19,24 @@
$dc = wdGetDataSetContext();
$optionAttribute = $wgRequest-getVal( WLD_OPTION_ATTRIBUTE );
- $attributeObject = $wgRequest-getVal( 'attribute-object' );
+ $attributeObject = $wgRequest-getVal( 'attribute-object', 0 );
$lang_code = $wgLang-getCode();
$dbr = wfGetDB( DB_SLAVE );
- $sql = 'SELECT language_id' .
-FROM {$dc}_syntrans .
-JOIN {$dc}_expression ON
{$dc}_expression.expression_id = {$dc}_syntrans.expression_id .
-WHERE {$dc}_syntrans.syntrans_sid = .
$attributeObject .
- ' AND ' . getLatestTransactionRestriction(
{$dc}_syntrans ) .
- ' AND ' . getLatestTransactionRestriction(
{$dc}_expression );
- $lang_res = $dbr-query( $sql );
- $objectLanguage = $dbr-fetchObject( $lang_res )-language_id;
- // language is not always defined, for example for a DM Option
Attribute
- if ( ! $objectLanguage ) $objectLanguage = 0 ;
+
+ $objectLanguage = 0 ;
+ if ( $attributeObject != 0 ) {
+ $sql = 'SELECT language_id' .
+FROM {$dc}_syntrans .
+JOIN {$dc}_expression ON
{$dc}_expression.expression_id = {$dc}_syntrans.expression_id .
+WHERE {$dc}_syntrans.syntrans_sid =
. $attributeObject .
+ ' AND ' .
getLatestTransactionRestriction( {$dc}_syntrans ) .
+ ' AND ' .
getLatestTransactionRestriction( {$dc}_expression );
+ $lang_res = $dbr-query( $sql );
+ $objectLanguage = $dbr-fetchObject( $lang_res
)-language_id;
+ // language is not always defined, for example for a DM
Option Attribute
+ if ( ! $objectLanguage ) $objectLanguage = 0 ;
+ }
$sql = SELECT
{$dc}_option_attribute_options.option_id,{$dc}_option_attribute_options.option_mid
.
FROM {$dc}_option_attribute_options .
@@ -67,7 +71,7 @@
' AND ' .
getLatestTransactionRestriction( {$dc}_syntrans ) .
' AND ' .
getLatestTransactionRestriction( {$dc}_expression );
$res = $dbr-query( $sql );
- if ( !$dbr-fetchObject( $res )-spelling )
+ if ( !$dbr-fetchObject( $res ) )
$sql = SELECT
{$dc}_expression.spelling .
FROM {$dc}_syntrans .
JOIN {$dc}_expression
ON {$dc}_expression.expression_id = {$dc}_syntrans.expression_id .
--
To view, visit https://gerrit.wikimedia.org/r/50934
To
