[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Templates: Improve the param value copying code

2017-02-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332397 )

Change subject: Templates: Improve the param value copying code
..


Templates: Improve the param value copying code

The loop that copying the values from source template to target
template based on mapping that we figured out was inverse. Now,
the loop is on source template params.

Also fixes the js error:
Uncaught TypeError: Cannot set property 'wt' of undefined
at ext.cx.tools.template.js line 850 observed in
I9ebc297126597

Bug: T157060
Follow-up: I9ebc297126597
Change-Id: Id06ff4d4bf8e188cfd6fec3fbabf8c7dd5fa685b
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 13 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, approved



diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index 1ae3692..e00c8b3 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -839,15 +839,21 @@
self.status = 'adapted';
}
 
-   $.each( self.targetTemplate.templateData.params, 
function ( key ) {
-   var savedParamValue;
+   $.each( self.sourceTemplate.templateData.params, 
function ( key ) {
+   var savedParamValue, mappedTargetKey;
 
-   if ( self.templateParamMapping[ key ] ) {
-   savedParamValue = 
self.targetTemplate.templateData.params[ key ].wt;
-   
self.targetTemplate.templateData.params[ key ] =
-   self.sourceTemplate.params[ 
self.templateParamMapping[ key ] ];
+   mappedTargetKey = self.templateParamMapping[ 
key ];
+   if ( mappedTargetKey ) {
// In case of restored templates, there 
will be a wt value. Keep that.
-   
self.targetTemplate.templateData.params[ key ].wt = savedParamValue;
+   savedParamValue = 
self.targetTemplate.templateData.params[ mappedTargetKey ] &&
+   
self.targetTemplate.templateData.params[ mappedTargetKey ].wt;
+   // Copy the value from source template 
to target template
+   
self.targetTemplate.templateData.params[ mappedTargetKey ] =
+   self.sourceTemplate.params[ key 
];
+   // restore the old value
+   if ( savedParamValue ) {
+   
self.targetTemplate.templateData.params[ mappedTargetKey ].wt = savedParamValue;
+   }
}
} );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/332397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id06ff4d4bf8e188cfd6fec3fbabf8c7dd5fa685b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Templates: Improve the param value copying code

2017-01-16 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332397 )

Change subject: Templates: Improve the param value copying code
..

Templates: Improve the param value copying code

The loop that copying the values from source template to target
template based on mapping that we figured out was inverse. Now,
the loop is on source template params.

Change-Id: Id06ff4d4bf8e188cfd6fec3fbabf8c7dd5fa685b
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 13 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/97/332397/1

diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index 1ae3692..e00c8b3 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -839,15 +839,21 @@
self.status = 'adapted';
}
 
-   $.each( self.targetTemplate.templateData.params, 
function ( key ) {
-   var savedParamValue;
+   $.each( self.sourceTemplate.templateData.params, 
function ( key ) {
+   var savedParamValue, mappedTargetKey;
 
-   if ( self.templateParamMapping[ key ] ) {
-   savedParamValue = 
self.targetTemplate.templateData.params[ key ].wt;
-   
self.targetTemplate.templateData.params[ key ] =
-   self.sourceTemplate.params[ 
self.templateParamMapping[ key ] ];
+   mappedTargetKey = self.templateParamMapping[ 
key ];
+   if ( mappedTargetKey ) {
// In case of restored templates, there 
will be a wt value. Keep that.
-   
self.targetTemplate.templateData.params[ key ].wt = savedParamValue;
+   savedParamValue = 
self.targetTemplate.templateData.params[ mappedTargetKey ] &&
+   
self.targetTemplate.templateData.params[ mappedTargetKey ].wt;
+   // Copy the value from source template 
to target template
+   
self.targetTemplate.templateData.params[ mappedTargetKey ] =
+   self.sourceTemplate.params[ key 
];
+   // restore the old value
+   if ( savedParamValue ) {
+   
self.targetTemplate.templateData.params[ mappedTargetKey ].wt = savedParamValue;
+   }
}
} );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/332397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id06ff4d4bf8e188cfd6fec3fbabf8c7dd5fa685b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits