Mercurial > hg > extraction-interface

comparison develop/views/Extractapp/TaggingText.php @ 42:c245d54eab9f extractapp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config lg server url, without port
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 12 Mar 2015 17:33:30 +0100
parents 2e938dc046db
children b3ca5d2b4d3f
comparison
equal deleted inserted replaced
41:533a6c39c128 42:c245d54eab9f
85 var info = JSON.parse('<?php echo json_encode($info) ?>'); 85 var info = JSON.parse('<?php echo json_encode($info) ?>');
86 console.log("currentFileId="+info['current_fileId']); 86 console.log("currentFileId="+info['current_fileId']);
87 87
88 if (info['current_fileId'] != 0 && info['current_fileId'] != info['file_id']){ 88 if (info['current_fileId'] != 0 && info['current_fileId'] != info['file_id']){
89 // -- there might be conflicts between different version 89 // -- there might be conflicts between different version
90 alert("Someone edited this file and saved before you.");
91 return;
92
90 var retVal = confirm('There were something happened/someone editing in the between of time.\nDo you want to force saving? (There might be conflicts between two versions.)'); 93 var retVal = confirm('There were something happened/someone editing in the between of time.\nDo you want to force saving? (There might be conflicts between two versions.)');
91 if( retVal == true ){ 94 if( retVal == true ){
92 // TODO: force saving with currentFileId 95 // TODO: force saving with currentFileId
93 alert("You do the force saving!"); 96 alert("You do the force saving!");
94 //saveTextToLGService(); 97 //saveTextToLGService();
149 alert("Just a reminder, there is a new version for this branch."); 152 alert("Just a reminder, there is a new version for this branch.");
150 } 153 }
151 */ 154 */
152 155
153 } 156 }
157
154 } 158 }
155 return; 159 return;
156 160
157 } 161 }
158 162