Mercurial > hg > extraction-interface
comparison models/extractapp.php @ 61:c6fa7f83c5bf extractapp
New: 1.display messages(style) 2.handle saving conflict:up-to-date or reload text
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Tue, 31 Mar 2015 12:34:57 +0200 |
parents | 3239979f6673 |
children | 3fb9e3884401 |
comparison
equal
deleted
inserted
replaced
60:3239979f6673 | 61:c6fa7f83c5bf |
---|---|
340 $this->file_id = (string)$response_file["id"]; | 340 $this->file_id = (string)$response_file["id"]; |
341 $this->branch_id = (string)$response_branch["id"]; | 341 $this->branch_id = (string)$response_branch["id"]; |
342 | 342 |
343 } else if ($status == "error") { | 343 } else if ($status == "error") { |
344 // saving not success | 344 // saving not success |
345 $this->messages['warning'] .= "[Warning] Saving Failed! ".(string)$response["message"]."<br>"; | 345 $this->messages['error'] .= "[Error] Saving Failed! ".(string)$response["message"]."<br>"; |
346 $this->messages['warning'] .= "[Warning] Please check branch ".$this->branch_id." in LGService, and modify from the latest version. <br>"; | 346 $this->messages['warning'] .= "[Warning] Please check branch ".$this->branch_id." in LGService, and modify from the latest version. <br>"; |
347 | 347 |
348 /* | 348 /* |
349 $this->messages .= "Saving Failed! ".(string)$response["message"]."<br>"; | 349 $this->messages .= "Saving Failed! ".(string)$response["message"]."<br>"; |
350 $this->messages .= "Please check branch ".$this->branch_id." in LGService, and modify from the latest version. <br>"; | 350 $this->messages .= "Please check branch ".$this->branch_id." in LGService, and modify from the latest version. <br>"; |