From d1b20dddef7a8fa92dd6da4d75cd2089d1dc5647 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 30 Sep 2014 13:50:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb           | 2 +-
 app/views/layouts/_base_header.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 4964e6cd2..26d61f94e 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -137,7 +137,7 @@ module WelcomeHelper
   #获取课程列表
   # add by nwb
   def find_miracle_course(sum=10, max_rate=7, school_id)
-    if User.current.user_extensions.school.nil? and school_id.nil?
+    if User.current.user_extensions.nil? && User.current.user_extensions.school.nil? and school_id.nil?
       Course.active.visible.
           joins(:memberships).
           group('members.course_id').
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index db275b90b..b0daf8c88 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -34,7 +34,7 @@
 	<div id="account">
 		<%= render_menu :account_menu -%>
 	</div>
-		<% if User.current.logged? -%>
+  <% if User.current.logged? -%>
 	<div id="loggedas">
 	<ul style="padding:0 0; margin:0 0;display:inline;">
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;" class="loggedas_li">

From 48164d8b94410d6af2ccc5889dfdf4465ebf31ba Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 8 Oct 2014 10:20:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E4=B8=AD=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=96=87=E6=9C=AC=E7=B1=BB=E9=99=84=E4=BB=B6=E6=8A=A5?=
 =?UTF-8?q?403=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/softapplication.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb
index 0234bc118..9e469d2ac 100644
--- a/app/models/softapplication.rb
+++ b/app/models/softapplication.rb
@@ -1,6 +1,6 @@
 class Softapplication < ActiveRecord::Base
   attr_accessible :android_min_version_available, :app_type_id, :app_type_name, :description, :name, :user_id, :contest_id, :application_developers, :deposit_project_url, :deposit_project
-  acts_as_attachable
+  acts_as_attachable :view_permission => :view_files
   seems_rateable :allow_update => true, :dimensions => :quality
 
 

From 6a41ccbc7ccb0bff4755b3d105cf54b0a664774c Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 8 Oct 2014 12:00:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?#1325=20=E5=8F=91=E5=B8=83=E7=9A=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E6=98=AF=E5=90=A6=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E2=80=9C=E5=85=AC=E5=BC=80=E2=80=9D2?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb |  2 ++
 app/views/attachments/_form.html.erb      | 11 +++++++----
 app/views/bids/show.html.erb              |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 215df8e10..c511b5ace 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -195,6 +195,8 @@ class AttachmentsController < ApplicationController
         end
       elsif !@attachment.container.nil? && @attachment.container.is_a?(Softapplication)
         format.html { redirect_to_referer_or softapplications_path(@attachment.container) }
+      elsif !@attachment.container.nil? && @attachment.container.is_a?(Bid)
+        format.html { redirect_to_referer_or respond_path(@attachment.container) }
       else
          if @project.nil?
            format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 5c22ff44c..d6cbb72fe 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -3,14 +3,17 @@
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-      if attachment.id.nil?
-       else
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <%= if attachment.id.nil?
+        #待补充代码
+      else
         link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
       end
       %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 3107d8bd6..b431ef97a 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -16,7 +16,7 @@
 		<div class="bid_description">
 			<%= textilizable(@bid, :description) %>
 			<% if @bid.attachments.any?%>
-			<% options = {:author => true} %>
+			<% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false)} %>
 			<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
 		<% end %>
 		</div>