diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index a301a1e6c..d5b0a25bf 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -514,6 +514,8 @@ private end def has_login - render_403 unless User.current.logged? + unless @attachment.container_type == "PhoneAppVersion" + render_403 unless User.current.logged? + end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 64a478187..165e22071 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1824,7 +1824,9 @@ module ApplicationHelper def attachment_candown attachment candown = false if attachment.container - if attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project + if attachment.container.class.to_s=="PhoneAppVersion" + candown = true + elsif attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project project = attachment.container.project candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1) elsif attachment.container.is_a?(Project) @@ -1850,6 +1852,7 @@ module ApplicationHelper candown = true elsif attachment.container.class.to_s=="StudentWork" candown = true + elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses course = attachment.container.courses.first candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1) diff --git a/app/views/projects/dts_dep.html.erb b/app/views/projects/dts_dep.html.erb index 66e053ebe..099e7d6d6 100644 --- a/app/views/projects/dts_dep.html.erb +++ b/app/views/projects/dts_dep.html.erb @@ -7,6 +7,8 @@ #out{} #in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;} #font_color{background:yellow;text-align:center;color:white;} + td.redBox {border:1px solid #b0b0b0; width:80px; background-color:#EAEAEA; } + td.redBox2 {border:1px solid #b0b0b0; width:120px; }
@@ -42,31 +44,33 @@
- \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4be8cdb6b..1ae607eb7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -396,8 +396,9 @@ RedmineApp::Application.routes.draw do get 'invite_members', :action=> 'invite_members' get 'invite_members_by_mail', :action=> 'invite_members_by_mail' + # get 'dts_repos', :aciton => 'dts_repos' get 'send_mail_to_member', :action => 'send_mail_to_member' - match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist" #add by huang + match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist" #end post 'modules' post 'archive'