diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 47a0930a5..b326051e6 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -37,19 +37,6 @@ class OrganizationsController < ApplicationController @organization = Organization.new render :layout => 'new_base' end - - def edit - @organization = Organization.find(params[:id]) - end - - def destroy - @organization = Organization.find(params[:id]) - @organization.destroy - respond_to do |format| - format.html{ redirect_to admin_organization_path } - end - end - def create @organization = Organization.new @organization.name = params[:organization][:name] @@ -94,11 +81,7 @@ class OrganizationsController < ApplicationController end @page = params[:page] respond_to do |format| - format.html { - if !params[:show_homepage].nil? - render :layout => 'base_organization' - end - } + format.html format.js end else @@ -106,13 +89,6 @@ class OrganizationsController < ApplicationController end end - def homepage - @organization = Organization.find(params[:id]) - respond_to do |format| - format.html {render :layout => 'base_organization'} - end - end - def update @organization = Organization.find(params[:id]) @organization.name = params[:organization][:name] @@ -166,12 +142,6 @@ class OrganizationsController < ApplicationController # end end - def cancel_homepage - @org = Organization.find(params[:id]) - @org.home_id = nil - @org.save - end - def autocomplete_search @project = Project.find(params[:project_id]) #@flag = params[:flag] || false diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index aa46c35ee..67cffab28 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -23,13 +23,33 @@ -
+
+
+ +
    +
  • <%= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
    • <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header' %> +
  • <%=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %>
    • <% else %> - <%= render :partial => 'layouts/unlogin_header' %> +
  • 登录
    • +
  • 注册
    • <% end %> -
+ + +
+
@@ -85,7 +105,7 @@ <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
-
+
<%= render_flash_messages %> <%= yield %> <%= call_hook :view_layouts_base_content %> @@ -96,7 +116,22 @@
- <%= render :partial => 'layouts/footer' %> +
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb index ce7014228..0eea2ce12 100644 --- a/app/views/organizations/_org_left_subfield_list.html.erb +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -1,5 +1,5 @@
- <%= link_to "组织首页",organization_path(@organization, :show_homepage => 1), :class => 'homepageMenuText', :target => '_blank' %> + <%= link_to "组织首页",organization_path(@organization, :show_homepage => 1), :class => 'homepageMenuText' %>
<%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %> diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 6ba60245a..a0f6dc60f 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -4,6 +4,11 @@
  • 状态
    • +
      +
    • 组织首页
      • +
    • 默认
      • +
      +
    • 动态
    • 默认
      • diff --git a/app/views/organizations/join_courses.js.erb b/app/views/organizations/join_courses.js.erb index 643af161f..dbe8b23ff 100644 --- a/app/views/organizations/join_courses.js.erb +++ b/app/views/organizations/join_courses.js.erb @@ -2,4 +2,5 @@ $("#homepageLeftMenuCourses").html(""); $("#homepageLeftMenuCourses").append("
        "); $("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses', :locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>"); -$("#homepageLeftMenuCourses").append("
      "); \ No newline at end of file +$("#homepageLeftMenuCourses").append("
    "); +$("#homepageLeftMenuCourses").show(); \ No newline at end of file diff --git a/app/views/organizations/join_projects.js.erb b/app/views/organizations/join_projects.js.erb index a39d94819..53a9e4a02 100644 --- a/app/views/organizations/join_projects.js.erb +++ b/app/views/organizations/join_projects.js.erb @@ -2,4 +2,5 @@ $("#homepageLeftMenuProjects").html(""); $("#homepageLeftMenuProjects").append("
      "); $("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects', :locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>"); -$("#homepageLeftMenuProjects").append("
    "); \ No newline at end of file +$("#homepageLeftMenuProjects").append(""); +$("#homepageLeftMenuProjects").show(); \ No newline at end of file diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index ca62b9664..e7875b49c 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -15,7 +15,7 @@ 版本库地址：<%= @repos_url %> <% else %> 版本库地址：<%= h @repository.url %> - <% end %>- + <% end %>
    diff --git a/db/schema.rb b/db/schema.rb index 6cc6b90c4..e7d270225 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -543,23 +543,32 @@ ActiveRecord::Schema.define(:version => 20151204062220) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - t.string "Num" - t.string "Variable" - t.string "TraceInfo" - t.string "Method" + create_table "dts", :primary_key => "Num", :force => true do |t| + t.string "Defect", :limit => 50 + t.string "Category", :limit => 50 t.string "File" - t.string "IPLine" - t.string "Review" - t.string "Category" - t.string "Defect" - t.string "PreConditions" - t.string "StartLine" + t.string "Method" + t.string "Module", :limit => 20 + t.string "Variable", :limit => 50 + t.integer "StartLine" + t.integer "IPLine" + t.string "IPLineCode", :limit => 200 + t.string "Judge", :limit => 15 + t.integer "Review", :limit => 1 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false + end + + create_table "editor_of_documents", :force => true do |t| + t.integer "editor_id" + t.integer "org_document_comment_id" + t.datetime "created_at" end create_table "enabled_modules", :force => true do |t| @@ -891,16 +900,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -1171,6 +1170,14 @@ ActiveRecord::Schema.define(:version => 20151204062220) do t.datetime "created_at" end + create_table "org_subfields", :force => true do |t| + t.integer "organization_id" + t.integer "priority" + t.string "name" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "organizations", :force => true do |t| t.string "name" t.text "description"