jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

编辑issue，与回复issue冲突问题（局部刷新）

This commit is contained in:
huang 2016-07-13 12:07:27 +08:00
parent 845f36c4f3
commit ef931d1491
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/views/issues/_form.html.erb
View File

@ -58,13 +58,6 @@
</ul> </ul>
</div> </div>
<li> <li>
<%# if @copy_from && @copy_from.attachments.any? %>
<!--<p>-->
<!-- 去除附件复制功能 -->
<!-- <label for="copy_attachments"><#%= l(:label_copy_attachments) %></label>
<#%= check_box_tag 'copy_attachments', '1', @copy_attachments %> -->
<!--</p>-->
<%# end %>
<% if @copy_from && !@copy_from.leaf? %> <% if @copy_from && !@copy_from.leaf? %>
<p> <p>
<label for="copy_subtasks"><%= l(:label_copy_subtasks) %></label> <label for="copy_subtasks"><%= l(:label_copy_subtasks) %></label>
@ -83,23 +76,6 @@
<%= render :partial => 'issues/attributes' %> <%= render :partial => 'issues/attributes' %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<!--<div class="newpro_box02 ">-->
<!--<label class="label"> <%#= l(:label_issue_watchers) %>：</label>-->
<!--<input id="" name="" size="22" class="fl mb10 h26" type="text" placeholder="搜索添加跟踪者">-->
<!--<span class="search_for_watchers">-->
<%#= link_to "",
# {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
# :remote => true,
# :method => 'get',
:class => "pic_sch mt5 ml5" %>
<!--</span>-->
<%#= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %>
<!--<div class="cl"></div>-->
<!--<span id="watchers_inputs">-->
<!--<%#= watchers_checkboxes(@issue, @available_watchers) %>-->
<!--</span>-->
<!--<div class="cl"></div>-->
<!--</div>-->
<%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %> <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
<% end %> <% end %>
<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a> <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>

5
app/views/issues/add_journal.js.erb
View File

@ -1,8 +1,9 @@
<% if @issue_id %> //issue详情中回复 <% if @issue_id %> //issue详情中回复
$("#reply_div_<%= @issue_id %>").html("<%= escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>"); $("#reply_div_<%= @issue_id %>").html("<%= escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
$("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>"); $("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>");
$("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>') $("#issue_detail_show").html('<%= escape_javascript(render :partial => 'issues/detail') %>')
sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%=@issue.class.name%>"); $("#issue_edit_show").html('<%= escape_javascript(render :partial => 'issues/edit') %>')
sd_create_editor_from_data(<%= @issue.id %>, null, "100%", "<%= @issue.class.name %>");
issue_desc_editor = KindEditor.create('#issue_description', issue_desc_editor = KindEditor.create('#issue_description',
{"width":"85%", {"width":"85%",
"resizeType":0, "resizeType":0,

6
app/views/issues/show.html.erb
View File

@ -15,7 +15,7 @@
} }
}); });
</script> </script>
<div class="homepageRight mt0 ml10" > <div class="homepageRight mt0 ml10" id =issue_show_total"">
<div class="homepageRightBanner"> <div class="homepageRightBanner">
<div class="NewsBannerName">问题跟踪</div> <div class="NewsBannerName">问题跟踪</div>
</div> </div>
@ -23,8 +23,12 @@
<div class="resources mt10" > <div class="resources mt10" >
<div class="pro_page_box"> <div class="pro_page_box">
<div class="problem_main borderBottomNone"> <div class="problem_main borderBottomNone">
<div id="issue_detail_show">
<%= render :partial => 'issues/detail'%> <%= render :partial => 'issues/detail'%>
</div>
<div id="issue_edit_show">
<%= render :partial => 'issues/edit'%> <%= render :partial => 'issues/edit'%>
</div>
</div> </div>
<!--problem_main end--> <!--problem_main end-->