From 83ac35cc94f64f1646754c8912488aa32c6356ef Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 May 2016 10:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=90=8D=E5=B8=88=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb                  | 1 +
 app/views/organizations/setting.html.erb                     | 5 +++++
 .../20160513021204_add_allow_teacher_to_organization.rb      | 5 +++++
 db/schema.rb                                                 | 3 ++-
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160513021204_add_allow_teacher_to_organization.rb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 922e9cb66..98483bb64 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -279,6 +279,7 @@ class OrganizationsController < ApplicationController
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
+    @organization.allow_teacher = params[:organization][:allow_teacher] == 'on' ? 1 : 0
     @organization.show_mode = params[:show_mode]
     #@organization.name = params[:organization][:name]
     @organization.save
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index c841b68b5..7b82f3a6e 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -87,6 +87,11 @@
           &nbsp;<span>允许游客下载</span>
           <span class="c_green f12" id="allow_down_hint"><%= @organization.is_public? ? "" : "（私有组织不允许游客下载资源）" %></span>
         </div>
+        <% if User.current.admin? %>
+                <div class="orgRow mb10 mt5"><span style="margin-left:10px;">允许设置名师榜&nbsp;: </span>
+                  <input id="allow_set_excellent_teachers" type="checkbox" style="margin-top:5px;" name="organization[allow_teacher]" <%= @organization.allow_teacher==1 ? 'checked': ''%> class="ml3" />
+                </div>
+        <% end %>
         <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org('<%=@organization.id %>','<%= @organization.name %>', $('#organization_name'));">保存</a>
         <% end %>
       </div>
diff --git a/db/migrate/20160513021204_add_allow_teacher_to_organization.rb b/db/migrate/20160513021204_add_allow_teacher_to_organization.rb
new file mode 100644
index 000000000..07b39c9a0
--- /dev/null
+++ b/db/migrate/20160513021204_add_allow_teacher_to_organization.rb
@@ -0,0 +1,5 @@
+class AddAllowTeacherToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :allow_teacher, :integer, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d8ddb7e0d..ac18f108b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160513012705) do
+ActiveRecord::Schema.define(:version => 20160513021204) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1614,6 +1614,7 @@ ActiveRecord::Schema.define(:version => 20160513012705) do
     t.boolean  "allow_guest_download", :default => true
     t.integer  "visits",               :default => 0
     t.integer  "show_mode",            :default => 0
+    t.integer  "allow_teacher",        :default => 0
   end
 
   create_table "permissions", :force => true do |t|