From 4959910ebea7667d959da6b353536c2d7fd6dd40 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 9 Sep 2016 14:20:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?ucloud=E6=97=A0=E6=B3=95=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=96=B0issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 2 +-
 app/views/issues/update.js.erb  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 8f8aabef5..0c1a34a96 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -78,5 +78,5 @@
     <div class="cl"></div>
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
-<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();location.reload()" class="blue_btn fl ml80" id="issue_confirm"> 确定</a>
+<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80" id="issue_confirm"> 确定</a>
 <a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a>
diff --git a/app/views/issues/update.js.erb b/app/views/issues/update.js.erb
index bd4385340..1e7ba1204 100644
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@@ -4,6 +4,7 @@ $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/e
 
 $("#issue_detail").show();
 $("#issue_edit").hide();
+location.reload();
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
 sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
 $(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');

From 19d925d592f25cb002ecbff6823e9765a6547590 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 9 Sep 2016 14:22:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=85=AC=E5=BC=80=E9=A1=B9=E7=9B=AE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_project_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_project_list.html.erb b/app/views/users/_project_list.html.erb
index 9aeb39ab5..828f4f7ac 100644
--- a/app/views/users/_project_list.html.erb
+++ b/app/views/users/_project_list.html.erb
@@ -37,7 +37,7 @@
 <% else %>
   <% projects.each_with_index do |project, i| %>
     <div class="syllabus_courses_list <%= i > 4 ? 'none' : ''%>" style="cursor: default;">
-      <% allow_visit = User.current.member_of?(project) || User.current.admin? || project.is_public == 1 %>
+      <% allow_visit = User.current.member_of?(project) || User.current.admin? || project.is_public? %>
       <div class="sy_courses_open">
         <span id="collect_project_icon_<%= project.id %>">
             <%=render :partial => 'collect_project', :locals => {:project => project} %>

From 89f3e0ee0d23d7457f6fb1d580e1f918ce0a0595 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 9 Sep 2016 14:43:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AEiuss:=E7=BC=96=E8=BE=91is?=
 =?UTF-8?q?sue=E6=97=B6=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/update.js.erb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/views/issues/update.js.erb b/app/views/issues/update.js.erb
index 1e7ba1204..733066d38 100644
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@@ -1,13 +1,5 @@
 <% if @saved %>
-$("#issue_detail").replaceWith('<%= escape_javascript(render :partial => 'issues/detail') %>')
-$("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
-
-$("#issue_detail").show();
-$("#issue_edit").hide();
 location.reload();
-$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
-$(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',
         {"width":"85%",
@@ -32,6 +24,7 @@ issue_desc_editor = KindEditor.create('#issue_description',
 //            "allowFileManager":true,
 //            "uploadJson":"/kindeditor/upload",
 //            "fileManagerJson":"/kindeditor/filemanager"});
+
 <%else%>
     alert('<%=  @issue.errors.full_messages[0].to_s%>')
 <%end %>