From 6e14e0b262c4e16629d92c3d4dbabcbdad3c6b8a Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 13 May 2014 12:01:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=88=A0=E9=99=A4=E5=85=A8=E9=83=A8=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 723b93bd6..7b0a0099c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1840,7 +1840,7 @@ a.remove-upload:hover {text-decoration:none !important;} /*gcm upload file count and deleteall*/ #upload_file_count #count {color:red; font-size:1.5em;} -span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;position:absolute;right:21px;text-decoration:none;} +span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;position:absolute;right:61px;text-decoration:none;} div.fileover { background-color: lavender; } From 73dcf3679d5125d4b07d517bff661cdfb02dd12c Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 13 May 2014 15:11:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5bd677bdf..708c23cac 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -32,7 +32,7 @@ module ProjectsHelper {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural}, # {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki}, {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural}, - {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}, + #{:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}, {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities} ] tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)} @@ -145,7 +145,7 @@ module ProjectsHelper #Added by young def course_settings_tabs tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'}, - {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1}, + #{:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural, :project_type => 1}, # {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural}, {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural} ] From 225f25f04cae110bbeda87ccb2c59cc3cf2ff442 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 13 May 2014 15:54:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8C=87=E5=AE=9Autf8=EF=BC=8C=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E7=BC=96=E7=A0=81=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20140508030039_create_attachmentstypes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/migrate/20140508030039_create_attachmentstypes.rb b/db/migrate/20140508030039_create_attachmentstypes.rb index c8cfdd9dd..39ee703a7 100644 --- a/db/migrate/20140508030039_create_attachmentstypes.rb +++ b/db/migrate/20140508030039_create_attachmentstypes.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 class CreateAttachmentstypes < ActiveRecord::Migration def self.up create_table :attachmentstypes do |t| From 57a4f45cad6825c8dd430d328d5048a5034442d2 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 13 May 2014 20:29:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4=E8=BF=94=E5=9B=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A1=AB=E5=85=A5=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E4=BF=A1=E6=81=AF=E5=90=8E=E5=BC=82=E5=B8=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 3136c5838..8f48d3857 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -715,13 +715,14 @@ class BidsController < ApplicationController def update @bid = Bid.find(params[:id]) + @project = @bid.courses.first if @bid.update_attributes(params[:bid]) flash[:notice] = l(:label_update_homework_succeed) - @project = Project.find(params[:course_id]) + #@project = Project.find(params[:course_id]) redirect_to project_homework_path(@project) else @bid.safe_attributes = params[:bid] - render :action => 'edit' + render :action => 'edit', :layout =>'base_courses' ,:bid_id=>@bid.id,:project_id =>@project end end From 603010c30a967de4507cc875f6d01cde5f333571 Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 14 May 2014 11:22:59 +0800 Subject: [PATCH 5/5] remove map --- app/views/welcome/course.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 005f53710..eef2401f8 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -60,7 +60,7 @@

新开课程

- <% if(find_miracle_course(10, 7,params[:school_id]).map.count == 0) %> + <% if(find_miracle_course(10, 7,params[:school_id]).count == 0) %> <%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1, :school_id => nil} %>