Signed-off-by: alan <547533434@qq.com>

app/controllers/files_controller.rb

@@ -84,7 +84,7 @@ class FilesController < ApplicationController
 
       @containers = [ Project.includes(:attachments).reorder(sort).find(@project.id)]
       @containers += @project.versions.includes(:attachments).reorder(sort).all
-
+      getattachtype
       show_attachments @containers
 
       render :layout => !request.xhr?
@@ -122,6 +122,7 @@ class FilesController < ApplicationController
           end
         end
       end
+      getattachtype
       @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
 
       show_attachments @containers
@@ -275,8 +276,7 @@ class FilesController < ApplicationController
 
     respond_to do |format|
       format.js
-      
-
+      format.html 
     end
   end
 end

app/views/files/_course_file.html.erb

@@ -2,11 +2,11 @@
 <% attachmenttypes = @course.attachmenttypes %>
 <% sufixtypes = @course.contenttypes %>
 
-<span class="borad-title">
-  <%= l(:label_coursefile_sharingarea)  %>
-</span>
+<span class="borad-title"><%=  t(:label_user_course) %>资源共享区</span>
 
 <div class="content-title-top">
+
+  <%#= link_to(l(:label_attachment_new), 'javascript:void(0);', :onclick=>"$('#file_buttons').slideToggle();", :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @course) %>
   <div class="clearfix"></div>
   <div id="file_buttons" class="nhidden">
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @course) %>
@@ -55,7 +55,7 @@
     <% if sufixtypes.any? %>
         &nbsp;
         <label for="attach_sufix_browse_label"><%= l(:attachment_sufix_browse) %></label>
-        <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') + options_for_select(sufixtypes),
+        <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
                        :onchange => "course_attachment_contenttypes_searchex(this.value)" %>
     <% end %>
   </div>
@@ -69,4 +69,5 @@
 <div id="all_browse_div" class="all_browse_div">
   <%= render :partial => 'course_show_all_attachment' %>
 </div>
-<% html_title(l(:label_course_file)) -%>
+
+<% html_title(l(:label_attachment_plural)) -%>

app/views/files/_project_file.html.erb

@@ -72,4 +72,4 @@
   <%= render :partial => 'show_all_attachment' %>
 </div>
 
-<% html_title(l(:project_module_files)) -%>
+<% html_title(l(:label_attachment_plural)) -%>

app/views/files/getattachtype.html.erb

@@ -0,0 +1,13 @@
+<% if @attachtype==0 && @contenttype=='0' %>
+    <% if @project%>
+        <%= render partial: "show_all_attachment"%>
+    <% elsif @course%>
+       <%= render partial: "course_show_all_attachment"%>
+    <%end%>
+<%else%>
+    <% if @project%>
+       <%= render partial: "sort_by_attachtypel"%>
+    <% elsif @course%>
+       <%= render partial: "course_sort_by_attachtypel"%>
+    <%end%>;
+<%end%>

app/views/files/getattachtype.js.erb

@@ -1,13 +1,13 @@
 <% if @attachtype==0 && @contenttype=='0' %>
-    <% if @project%>
-        $("#all_browse_div").html('<%= j(render partial: "show_all_attachment")%>');
-    <% elsif @course%>
-        $("#all_browse_div").html('<%= j(render partial: "course_show_all_attachment")%>');
-    <%end%>
-<%else%>
-    <% if @project%>
-        $("#all_browse_div").html('<%= j(render partial: "sort_by_attachtypel")%>')
-    <% elsif @course%>
-        $("#all_browse_div").html('<%= j(render partial: "course_sort_by_attachtypel")%>')
-    <%end%>;
+<% if @project%>
+$("#all_browse_div").html('<%= j(render partial: "show_all_attachment")%>');
+<% elsif @course%>
+$("#all_browse_div").html('<%= j(render partial: "course_show_all_attachment")%>');
+<%end%>
+<%else%>
+<% if @project%>
+$("#all_browse_div").html('<%= j(render partial: "sort_by_attachtypel")%>')
+<% elsif @course%>
+$("#all_browse_div").html('<%= j(render partial: "course_sort_by_attachtypel")%>')
+<%end%>;
 <%end%>

app/views/files/index.html.erb

@@ -1,248 +1,249 @@
-<!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
-<% if @isproject %>
-    <%= render :partial => 'project_file', locals: {project: @project} %>
-<% else %>
-    <%= render :partial => 'course_file', locals: {course: @course} %>
-<% end %>
-
-
-<script type='text/javascript'>
-    var slideHeight = 29;
-    function readmore(aNode) {
-        // console.log(aNode)
-        // var $td_tags_area = $(aNode).parent().parent();
-        var $td_tags_area = $(aNode).parent().parent().parent().parent();
-        var $tags_area = $td_tags_area.find('.tags_area')
-        var $tags_gradint = $td_tags_area.find('.tags_gradint')
-        var $read_more = $td_tags_area.find('.read-more')
-        var $read_more_a = $td_tags_area.find('.read-more a')
-        var $tags = $td_tags_area.find('#tags')
-        var $icona = $td_tags_area.find('.tags_icona')
-
-        var slideHeight = 13; //px
-        var defHeight = $tags.height();
-
-        var curHeight = $tags_area.height();
-        if (curHeight == slideHeight) {
-            $tags_area.animate({
-                height: defHeight
-            }, 'normal');
-            $read_more_a.html('隐藏');
-            $icona.html('<%=image_tag "/images/sidebar/minus.png"%>')
-            $tags_gradint.fadeOut();
-        } else {
-            $tags_area.animate({
-                height: slideHeight
-            }, 'normal');
-            $read_more_a.html('更多');
-            $icona.html('<%=image_tag "/images/sidebar/add.png"%>')
-            $tags_gradint.fadeIn();
-        }
-        ;
-
-    }
-    $(function () {
-        var slideHeight = 20; //px
-        var defHeight = $('.tags_area').height();
-        if (defHeight >= slideHeight) {
-            $('.tags_area').css('height', slideHeight + 'px');
-        }
-        ;
-    });
-
-    function eval_ajax(xhr, textStatus) {
-        if (textStatus == 'success') {
-            eval(xhr.responseText);
-        } else if (textStatus == 'error') {
-//            alert('error');
-        }
-    }
-
-
-    function attachment_contenttypes_searchex(value) {
-        <% if  @project%>
-        $.ajax({
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-
-
-    function attachtype_edit(value) {
-        <% if  @project%>
-        $.ajax({
-
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function attachmenttypes_searchex(value) {
-        <% if  @project%>
-        $.ajax({
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-            type: "POST",
-            data: {
-                type: encodeURIComponent(value),
-                contentType: $('#attach_sufix_browse').val()
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function course_attachmenttypes_searchex(value) {
-        <% if  @course %>
-        $.ajax({
-            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-            type: "POST",
-            data: {
-                type: encodeURIComponent(value),
-                contentType: $('#attach_sufix_browse').val()
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function course_attachment_contenttypes_searchex(value) {
-        <% if  @course%>
-            $.ajax({
-                url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-                type: "POST",
-                data: {
-                    type: $('#attachment_browse').val(),
-                    contentType: encodeURIComponent(value)
-                }
-
-            }).complete(eval_ajax);
-        <%end%>
-    }
-    function course_attachtype_edit(value) {
-        <% if  @course%>
-        $.ajax({
-            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-            type: "POST",
-            data: {
-                type: $('#attachment_browse').val(),
-                contentType: encodeURIComponent(value)
-            }
-
-        }).complete(eval_ajax);
-        <%end%>
-    }
-
-    function attachmenttypes_change(id, type) {
-        <% if  @project%>
-        $.ajax({
-            url: '<%=updateType_attachments_path%>',
-            type: "POST",
-            data: {
-                attachmentid: encodeURIComponent(id),
-                newtype: encodeURIComponent(type)
-            }
-
-        }).complete(function (xhr, textStatus) {
-
-                    if (textStatus == 'success') {
-                        $.ajax({
-                            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
-                            type: "POST",
-                            data: {
-                                type: $('#attachment_browse').val(),
-                                contentType: $('#attach_sufix_browse').val()
-                            }
-                        }).error(function () {
-                                    alert('error');
-                                });
-                    } else if (textStatus == 'error') {
-                        alert('An error has occurred');
-                    }
-                });
-        <%end%>
-
-    }
-
-    function course_attachmenttypes_change(id, type) {
-        <% if  @course%>
-        $.ajax({
-            url: '<%=updateType_attachments_path%>',
-            type: "POST",
-            data: {
-                attachmentid: encodeURIComponent(id),
-                newtype: encodeURIComponent(type)
-            }
-
-        }).complete(function (xhr, textStatus) {
-
-                    if (textStatus == 'success') {
-                        $.ajax({
-                            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
-                            type: "POST",
-                            data: {
-                                type: $('#attachment_browse').val(),
-                                contentType: $('#attach_sufix_browse').val()
-                            }
-                        }).error(function () {
-                                    alert('error');
-                                });
-                    } else if (textStatus == 'error') {
-                        alert('An error has occurred');
-                    }
-                });
-        <%end%>
-
-    }
-
-    // 编辑文件密级
-    function file_dense_edit(id, type) {
-        $.ajax({
-            url: '<%=updateFileDense_attachments_path%>',
-            type: "POST",
-            remote:"true",
-            data: {
-                attachmentid: encodeURIComponent(id),
-                newtype: encodeURIComponent(type)
-            }
-
-        }).complete(function (xhr, textStatus) {
-                });
-
-    }
-
-</script>
-
-
-<script type='text/javascript'>
-    function tagAddClick(divid, objId, objTag) {
-        alert("OK");
-        $.ajax({
-            type: "POST",
-            url: '/users/tag_saveEx',
-            data: {
-                tagname: $('tag_name').value,
-                obj_id: encodeURIComponent(objId),
-                obj_flag: encodeURIComponent(objTag)
-            },
-            success: function (data, textStatus) {
-                alert("OK");
-                $(divid).empty();
-                $(divid).html('123');
-                $("#" + divid + " #name").val("");
-            }
-        })
-    }
-</script>
+<!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
+<% if @isproject %>
+    <%= render :partial => 'project_file', locals: {project: @project} %>
+<% else %>
+    <%= render :partial => 'course_file', locals: {course: @course} %>
+<% end %>
+
+
+<script type='text/javascript'>
+    var slideHeight = 29;
+    function readmore(aNode) {
+        // console.log(aNode)
+        // var $td_tags_area = $(aNode).parent().parent();
+        var $td_tags_area = $(aNode).parent().parent().parent().parent();
+        var $tags_area = $td_tags_area.find('.tags_area')
+        var $tags_gradint = $td_tags_area.find('.tags_gradint')
+        var $read_more = $td_tags_area.find('.read-more')
+        var $read_more_a = $td_tags_area.find('.read-more a')
+        var $tags = $td_tags_area.find('#tags')
+        var $icona = $td_tags_area.find('.tags_icona')
+
+        var slideHeight = 13; //px
+        var defHeight = $tags.height();
+
+        var curHeight = $tags_area.height();
+        if (curHeight == slideHeight) {
+            $tags_area.animate({
+                height: defHeight
+            }, 'normal');
+            $read_more_a.html('隐藏');
+            $icona.html('<%=image_tag "/images/sidebar/minus.png"%>')
+            $tags_gradint.fadeOut();
+        } else {
+            $tags_area.animate({
+                height: slideHeight
+            }, 'normal');
+            $read_more_a.html('更多');
+            $icona.html('<%=image_tag "/images/sidebar/add.png"%>')
+            $tags_gradint.fadeIn();
+        }
+        ;
+
+    }
+    $(function () {
+        var slideHeight = 20; //px
+        var defHeight = $('.tags_area').height();
+        if (defHeight >= slideHeight) {
+            $('.tags_area').css('height', slideHeight + 'px');
+        }
+        ;
+    });
+
+    function eval_ajax(xhr, textStatus) {
+        if (textStatus == 'success') {
+            eval(xhr.responseText);
+        } else if (textStatus == 'error') {
+            alert('error');
+        }
+    }
+
+
+    function attachment_contenttypes_searchex(value) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+
+
+    function attachtype_edit(value) {
+        <% if  @project%>
+        $.ajax({
+
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function attachmenttypes_searchex(value) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: encodeURIComponent(value),
+                contentType: $('#attach_sufix_browse').val()
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function course_attachmenttypes_searchex(value) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: encodeURIComponent(value),
+                contentType: $('#attach_sufix_browse').val()
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function course_attachment_contenttypes_searchex(value) {
+        <% if  @course%>
+        $.ajax({
+
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+    function course_attachtype_edit(value) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function attachmenttypes_change(id, type) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=updateType_attachments_path%>',
+            type: "POST",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+
+                    if (textStatus == 'success') {
+                        $.ajax({
+                            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+                            type: "POST",
+                            data: {
+                                type: $('#attachment_browse').val(),
+                                contentType: $('#attach_sufix_browse').val()
+                            }
+                        }).error(function () {
+                                    alert('error');
+                                });
+                    } else if (textStatus == 'error') {
+                        alert('An error has occurred');
+                    }
+                });
+        <%end%>
+
+    }
+
+    function course_attachmenttypes_change(id, type) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=updateType_attachments_path%>',
+            type: "POST",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+
+                    if (textStatus == 'success') {
+                        $.ajax({
+                            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+                            type: "POST",
+                            data: {
+                                type: $('#attachment_browse').val(),
+                                contentType: $('#attach_sufix_browse').val()
+                            }
+                        }).error(function () {
+                                    alert('error');
+                                });
+                    } else if (textStatus == 'error') {
+                        alert('An error has occurred');
+                    }
+                });
+        <%end%>
+
+    }
+
+    // 编辑文件密级
+    function file_dense_edit(id, type) {
+        $.ajax({
+            url: '<%=updateFileDense_attachments_path%>',
+            type: "POST",
+            remote:"true",
+            data: {
+                attachmentid: encodeURIComponent(id),
+                newtype: encodeURIComponent(type)
+            }
+
+        }).complete(function (xhr, textStatus) {
+                });
+
+    }
+
+</script>
+
+
+<script type='text/javascript'>
+    function tagAddClick(divid, objId, objTag) {
+        alert("OK");
+        $.ajax({
+            type: "POST",
+            url: '/users/tag_saveEx',
+            data: {
+                tagname: $('tag_name').value,
+                obj_id: encodeURIComponent(objId),
+                obj_flag: encodeURIComponent(objTag)
+            },
+            success: function (data, textStatus) {
+                alert("OK");
+                $(divid).empty();
+                $(divid).html('123');
+                $("#" + divid + " #name").val("");
+            }
+        })
+    }
+</script>