Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/attachments/upload_attachment_version.js.erb

@@ -1,7 +1,7 @@
 <% if @flag %>
     hideModal();
-    alert('更新成功')
+    alert('更新成功');
     $(".re_search").submit(); // 为了刷新
 <%else%>
-    $("#upload_file_count").html('(更新失败)')
+    $("#upload_file_count").html('(更新失败)');
 <%end %>

public/javascripts/application.js

@@ -426,13 +426,15 @@ function hideModal(el) {
   if($("#popupWrap").length > 0){
       $("#popupWrap").hide();
   }
-  var modal;
-  if (el) {
-    modal = $(el).parents('.ui-dialog-content');
-  } else {
-    modal = $('#ajax-modal');
+  else{
+      var modal;
+      if (el) {
+          modal = $(el).parents('.ui-dialog-content');
+      } else {
+          modal = $('#ajax-modal');
+      }
+      modal.dialog("close");
   }
-  modal.dialog("close");
 }
 
 function submitPreview(url, form, target) {