Commit 9be30def by Masaru Abe

#15795 【DSN】Androidから未DLマーク無しコンテンツのバックアップデータをWebにリストアするとNEWになる

parent fc7b1a01
...@@ -906,9 +906,10 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -906,9 +906,10 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
//コンテンツ状態バックアップ対応 //コンテンツ状態バックアップ対応
var bkContentStatus = HEADER.getContentStatus(contId); var bkContentStatus = HEADER.getContentStatus(contId);
var contentStatus = null; var contentStatus = null;
if( bkContentStatus == 0){ if( bkContentStatus == 0 || bkContentStatus == 4){
contentStatus = 0; //READ contentStatus = 0; //READ
} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){ //} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){
} else if(bkContentStatus == 1 || bkContentStatus == 2){
contentStatus = 1; //NEW contentStatus = 1; //NEW
} else if(bkContentStatus == 3){ } else if(bkContentStatus == 3){
contentStatus = 2; //UPDATE contentStatus = 2; //UPDATE
......
...@@ -751,9 +751,10 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer){ ...@@ -751,9 +751,10 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer){
//コンテンツ状態バックアップ対応 //コンテンツ状態バックアップ対応
var bkContentStatus = HEADER.getContentStatus(contId); var bkContentStatus = HEADER.getContentStatus(contId);
var contentStatus = null; var contentStatus = null;
if( bkContentStatus == 0){ if( bkContentStatus == 0 || bkContentStatus == 4){
contentStatus = 0; //READ contentStatus = 0; //READ
} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){ //} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){
} else if(bkContentStatus == 1 || bkContentStatus == 2){
contentStatus = 1; //NEW contentStatus = 1; //NEW
} else if(bkContentStatus == 3){ } else if(bkContentStatus == 3){
contentStatus = 2; //UPDATE contentStatus = 2; //UPDATE
......
...@@ -1915,9 +1915,10 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1915,9 +1915,10 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
var bkContentStatus = HEADER.getContentStatus(contId); var bkContentStatus = HEADER.getContentStatus(contId);
//console.log("contId:" + contId + " bkStatus:" + bkContentStatus); //console.log("contId:" + contId + " bkStatus:" + bkContentStatus);
var contentStatus = null; var contentStatus = null;
if( bkContentStatus == 0){ if( bkContentStatus == 0 || bkContentStatus == 4){
contentStatus = 0; //READ contentStatus = 0; //READ
} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){ //} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){
} else if( bkContentStatus == 1 || bkContentStatus == 2 ){
contentStatus = 1; //NEW contentStatus = 1; //NEW
} else if(bkContentStatus == 3){ } else if(bkContentStatus == 3){
contentStatus = 2; //UPDATE contentStatus = 2; //UPDATE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment