From fb935f124cbf82612a446fcbfe3f407d3043c2c8 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 11 Apr 2015 17:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 16 +--- .../projects/settings/_new_edit.html.erb | 75 +++++++++---------- public/stylesheets/project.css | 3 + 3 files changed, 41 insertions(+), 53 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4c46b6586..406b921ac 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -455,22 +455,10 @@ class ProjectsController < ApplicationController def update @project.safe_attributes = params[:project] @project.organization_id = params[:organization_id] - #@project.dts_test = params[:project][:dts_test] + params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 + params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0 if validate_parent_id && @project.save - @course = Course.find_by_extra(@project.identifier) - unless @course.nil? - @course.password = params[:project][:course][:password] - # added by bai - @course.term = params[:term] - @course.time = params[:time] - @course.setup_time = params[:setup_time] - @course.endup_time = params[:endup_time] - @course.class_period = params[:class_period] - # end - @course.save - end @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') - if params[:project][:is_public] == '0' project_status = ProjectStatus.find_by_project_id(@project.id) project_status.destroy if project_status diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb index 92d52e5b6..246395b6e 100644 --- a/app/views/projects/settings/_new_edit.html.erb +++ b/app/views/projects/settings/_new_edit.html.erb @@ -1,40 +1,37 @@ - + 保存 +<% end %> +
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index f212ee2d1..ddb23e282 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -354,6 +354,9 @@ blockquote { font-family: "Microsoft YaHei"; background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg); } +/*上传项目图片*/ +.upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer} +/*配置*/ .pro_st_ttl{ height:24px;} .pro_st_ctt{height:auto; clear:both;} .pro_setting{width:670px;/*滑动门的宽度*/}