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

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

This commit is contained in:
huang 2016-01-22 20:03:13 +08:00
parent f2d93c0b72 4b183c2928
commit 29c49fbb0c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/files/_course_file.html.erb
View File

@ -126,4 +126,4 @@
<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %> <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
</div> </div>
</div> </div>
<% html_title(l(:label_attachment_plural)) -%> <%# html_title(l(:label_attachment_plural)) -%>

2
app/views/files/_project_file.html.erb
View File

@ -95,4 +95,4 @@
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %> <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
</div> </div>
</div> </div>
<% html_title(l(:label_attachment_plural)) -%> <%# html_title(l(:label_attachment_plural)) -%>

2
app/views/files/_subfield_files.html.erb
View File

@ -74,7 +74,7 @@
</div><!---re_con end--> </div><!---re_con end-->
</div> </div>
<% html_title(l(:label_attachment_plural)) -%> <%# html_title(l(:label_attachment_plural)) -%>
<script> <script>
function org_upload_files(org_subfield_id){ function org_upload_files(org_subfield_id){
$.ajax({ $.ajax({