[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: While adapting after a restore, keep the old edited values

2016-12-13 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326885 )

Change subject: While adapting after a restore, keep the old edited values
..


While adapting after a restore, keep the old edited values

These values were getting missed while doing a re-adapt.

Change-Id: Iee5f8ca3272963cf2825f471528abb8853e3c30e
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 5 insertions(+), 0 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 692d1e3..0257c35 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -843,9 +843,14 @@
}
 
$.each( self.targetTemplate.templateData.params, 
function ( key ) {
+   var savedParamValue;
+
if ( self.templateParamMapping[ key ] ) {
+   savedParamValue = 
self.targetTemplate.templateData.params[ key ].wt;

self.targetTemplate.templateData.params[ key ] =
self.sourceTemplate.params[ 
self.templateParamMapping[ key ] ];
+   // In case of restored templates, there 
will be a wt value. Keep that.
+   
self.targetTemplate.templateData.params[ key ].wt = savedParamValue;
}
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee5f8ca3272963cf2825f471528abb8853e3c30e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
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]: While adapting after a restore, keep the old edited values

2016-12-12 Thread Santhosh (Code Review)
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326885 )

Change subject: While adapting after a restore, keep the old edited values
..

While adapting after a restore, keep the old edited values

These values were getting missed while doing a re-adapt.

Change-Id: Iee5f8ca3272963cf2825f471528abb8853e3c30e
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index 692d1e3..0257c35 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -843,9 +843,14 @@
}
 
$.each( self.targetTemplate.templateData.params, 
function ( key ) {
+   var savedParamValue;
+
if ( self.templateParamMapping[ key ] ) {
+   savedParamValue = 
self.targetTemplate.templateData.params[ key ].wt;

self.targetTemplate.templateData.params[ key ] =
self.sourceTemplate.params[ 
self.templateParamMapping[ key ] ];
+   // In case of restored templates, there 
will be a wt value. Keep that.
+   
self.targetTemplate.templateData.params[ key ].wt = savedParamValue;
}
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee5f8ca3272963cf2825f471528abb8853e3c30e
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