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

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

This commit is contained in:
huang 2016-11-15 09:02:15 +08:00
parent 3561009efc 442be21a30
commit e9ec3ca258
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@
{:onchange => "change_milestone_tip();", :class => "w150"} %> {:onchange => "change_milestone_tip();", :class => "w150"} %>
</li> </li>
<li class=" clear" id="milestone_option_tips"> <li class=" clear" id="milestone_option_tips">
<%= @issue.fixed_version.nil? ? "无里程碑" : "已指派里程碑" %> <%= @issue.fixed_version.nil? ? "未选择里程碑" : "已选择里程碑" %>
<% if params[:action] == "new" %> <% if params[:action] == "new" %>
<%= link_to "", new_project_version_path(@project, :is_issue => true, :issue_project_id => @project.id), :class => "pic_add mt5 ml5 fr", :remote => true %> <%= link_to "", new_project_version_path(@project, :is_issue => true, :issue_project_id => @project.id), :class => "pic_add mt5 ml5 fr", :remote => true %>
<% end %> <% end %>
@ -147,9 +147,9 @@
} }
function change_milestone_tip(version_id){ function change_milestone_tip(version_id){
if( document.getElementById('issue_fixed_version_id').options[document.getElementById('issue_fixed_version_id').selectedIndex].value == 0 ){ if( document.getElementById('issue_fixed_version_id').options[document.getElementById('issue_fixed_version_id').selectedIndex].value == 0 ){
$('#milestone_option_tips').html("未指派里程碑")} $('#milestone_option_tips').html("未选择里程碑")}
else{ else{
$('#milestone_option_tips').html("已指派里程碑") $('#milestone_option_tips').html("已选择里程碑")
}; };
} }
function issue_start_date_change(){ function issue_start_date_change(){

2
app/views/issues/_issue_filter.html.erb
View File

@ -1 +1 @@
<span class="issues_nav_tag ml5" ><%= @issues_filter_assign_count %><%= @project.issues.where(:assigned_to_id => User.current.id ).visible.all.count %></span> <span class="issues_nav_tag ml5" ><%= @project.issues.where(:assigned_to_id => User.current.id ).visible.all.count %></span>