From c197c946a4a4214aabf540eb76e5c86a4e420730 Mon Sep 17 00:00:00 2001
From: jack <la5c@qq.com>
Date: Wed, 2 May 2018 16:59:48 +0800
Subject: [PATCH] display error detial in version submit

---
 application/admin/views/scripts/data/version.phtml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/application/admin/views/scripts/data/version.phtml b/application/admin/views/scripts/data/version.phtml
index 5388f1e6..36c95337 100644
--- a/application/admin/views/scripts/data/version.phtml
+++ b/application/admin/views/scripts/data/version.phtml
@@ -68,6 +68,17 @@
 <!-- //页面内容 -->
 <script>
 $('#wapper').width($('body').width()-300);
+
+function errorContentHtml(err){
+    var html = "";
+    if(err && err.error)
+        html += "<h4>" + err.error + "</h4>";
+    if(err && err.detail)
+        html += "<p>" + err.detail + "</p>";
+
+    return html;
+}
+
 function action(ac,id){
 	$.ajax({
 	  'type':"POST",
@@ -77,7 +88,7 @@ function action(ac,id){
 		  if (typeof(data)=='object')
 		  {
 			if(typeof(data.error)!='undefined')
-			{$.colorbox({'innerWidth':'50%','html':data.error});}
+			{$.colorbox({'innerWidth':'50%','html': errorContentHtml(data)});}
 			if(typeof(data.deleted)!='undefined')
 			{$('#list_'+data.deleted).fadeOut("slow",function(){$(this).remove();});}
 			if(typeof(data.commited)!='undefined')