Merge branch 'dev_aliyun' into educoder

dev_aliyun
daiao 5 years ago
commit f6852deb59

@ -5,16 +5,16 @@
<% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project") %> <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project") %>
<i class="fa fa-align-justify color-grey-9"> <i class="fa fa-align-justify color-grey-9">
<ul class="homepagePostSettiongText"> <ul class="homepagePostSettiongText">
<% if hidden_unproject_infos %> <%# if hidden_unproject_infos %>
<li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li> <!-- <li><%#= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>-->
<% else %> <%# else %>
<li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li> <!-- <li><%#= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li>-->
<% end %> <%# end %>
<% if params[:tag_name].blank? %> <%# if params[:tag_name].blank? %>
<li><%= link_to '更新版本',attachments_versions_path(file, :project_id => project.id), :class => "postOptionLink", :remote => true %></li> <!-- <li><%#= link_to '更新版本',attachments_versions_path(file, :project_id => project.id), :class => "postOptionLink", :remote => true %></li>-->
<% else %> <%# else %>
<li><%= link_to '更新版本',attachments_versions_path(file, :tag_name => params[:tag_name].force_encoding("UTF-8"), :project_id => project.id, :other => params[:other]),:class => "postOptionLink",:remote=>true %></li> <!-- <li><%#= link_to '更新版本',attachments_versions_path(file, :tag_name => params[:tag_name].force_encoding("UTF-8"), :project_id => project.id, :other => params[:other]),:class => "postOptionLink",:remote=>true %></li>-->
<% end %> <%# end %>
<% if project.is_public? %> <% if project.is_public? %>
<li> <li>
@ -38,15 +38,15 @@
</i> </i>
<% end %> <% end %>
<% else %> <% else %>
<i class="fa fa-align-justify color-grey-9"> <!-- <i class="fa fa-align-justify color-grey-9">-->
<ul class="resourceSendO"> <!-- <ul class="resourceSendO">-->
<% if hidden_unproject_infos %> <%# if hidden_unproject_infos %>
<li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li> <!-- <li><%#= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>-->
<% else %> <%# else %>
<li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li> <!-- <li><%#= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li>-->
<% end %> <%# end %>
</ul> <!-- </ul>-->
</i> <!-- </i>-->
<% end %> <% end %>
<% end %> <% end %>
</li> </li>

Loading…
Cancel
Save