parent
2e36cf6d6a
commit
3881e5c5c5
|
@ -204,7 +204,9 @@ class AttachmentsController < ApplicationController
|
||||||
@attachment.save
|
@attachment.save
|
||||||
@newfiledense = filedense
|
@newfiledense = filedense
|
||||||
end
|
end
|
||||||
|
if @attachment.container_type == "Project" || @attachment.container_type == "Course"
|
||||||
tip_attachment_update
|
tip_attachment_update
|
||||||
|
end
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.js
|
format.js
|
||||||
|
@ -626,7 +628,6 @@ class AttachmentsController < ApplicationController
|
||||||
def attachment_versions
|
def attachment_versions
|
||||||
@attachment = Attachment.find(params[:id])
|
@attachment = Attachment.find(params[:id])
|
||||||
@attachment_histories = @attachment.attachment_histories
|
@attachment_histories = @attachment.attachment_histories
|
||||||
@container_tip = Project.find(params[:project_id])
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.js
|
format.js
|
||||||
end
|
end
|
||||||
|
|
|
@ -90,6 +90,7 @@ class FilesController < ApplicationController
|
||||||
@tag_list = get_course_tag_list @course
|
@tag_list = get_course_tag_list @course
|
||||||
end
|
end
|
||||||
@all_attachments = @result
|
@all_attachments = @result
|
||||||
|
get_attachment_for_tip(@all_attachments)
|
||||||
@limit = 10
|
@limit = 10
|
||||||
@feedback_count = @all_attachments.count
|
@feedback_count = @all_attachments.count
|
||||||
@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
|
@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
|
||||||
|
@ -164,6 +165,7 @@ class FilesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
@all_attachments = @project_attachment_result
|
@all_attachments = @project_attachment_result
|
||||||
|
get_attachment_for_tip(@all_attachments)
|
||||||
@limit = 10
|
@limit = 10
|
||||||
@feedback_count = @all_attachments.count
|
@feedback_count = @all_attachments.count
|
||||||
@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
|
@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
|
||||||
$("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} )%>");
|
$("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} )%>");
|
||||||
$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
|
$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
|
||||||
|
$("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
|
Loading…
Reference in New Issue