资源库区分“引入我的项目”和“引入我的其它项目”

修复新建项目冲突

app/controllers/issues_controller.rb

@@ -84,15 +84,10 @@ class IssuesController < ApplicationController
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                              :order => sort_clause,
+                                :order => sort_clause,
-                              :offset => @offset,
+                                :offset => @offset,
-                              :limit => @limit)
+                                :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
-
-
-
-
-
       respond_to do |format|
         format.js
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young

app/controllers/projects_controller.rb

@@ -31,7 +31,7 @@ class ProjectsController < ApplicationController
   before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
-  before_filter :file, :statistics, :watcherlist
+  before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
   before_filter :memberAccess, only: :member
 
@@ -681,10 +681,12 @@ class ProjectsController < ApplicationController
   end
 
   def watcherlist
-    if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+    unless @project.nil?
-      render_403
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
-    else
+        render_403
-      @users -= watched.watcher_users if  @watched
+      else
+        @users -= watched.watcher_users if  @watched
+      end
     end
   end
 

app/views/files/_project_file_list.html.erb

@@ -20,12 +20,16 @@
         <div class="">
           <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
           <% if User.current.logged? %>
-                <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
+              <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
-                <% if authority_pubilic_for_files(project, file) %>
+                  <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
+              <% else %>
+                  <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
+              <% end %>
+              <% if authority_pubilic_for_files(project, file) %>
                     <span id="is_public_<%= file.id %>">
-                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
+                      <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
                     </span>
-                <% end %>
+              <% end %>
           <% end %>
         </div>
         <div class="cl"></div>