From eadab840b61b03fe62925c37530e27c98a3bba1d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 3 Nov 2015 11:19:38 +0800 Subject: [PATCH 01/55] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E3=80=81=E6=88=90=E5=91=98=E8=A1=A8=E5=8F=8A=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=EF=BC=9B=20=E7=BC=96=E5=86=99?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/organizations.js.coffee | 3 + app/assets/stylesheets/organizations.css.scss | 3 + app/controllers/organizations_controller.rb | 15 +++ app/helpers/organizations_helper.rb | 2 +- app/models/org_member.rb | 4 + app/models/organization.rb | 4 +- app/views/layouts/new_base.html.erb | 2 +- app/views/organizations/create.js.erb | 0 app/views/organizations/new.html.erb | 95 +++++++++++++++++++ config/locales/commons/zh.yml | 4 + config/routes.rb | 2 + ...b => 20151103011119_create_org_members.rb} | 7 +- public/stylesheets/org.css | 6 ++ .../organizations_controller_spec.rb | 5 + spec/factories/org_members.rb | 8 ++ spec/models/org_member_spec.rb | 5 + 16 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/organizations.js.coffee create mode 100644 app/assets/stylesheets/organizations.css.scss create mode 100644 app/controllers/organizations_controller.rb create mode 100644 app/models/org_member.rb create mode 100644 app/views/organizations/create.js.erb create mode 100644 app/views/organizations/new.html.erb rename db/migrate/{20151102090519_create_org_members.rb => 20151103011119_create_org_members.rb} (76%) create mode 100644 public/stylesheets/org.css create mode 100644 spec/controllers/organizations_controller_spec.rb create mode 100644 spec/factories/org_members.rb create mode 100644 spec/models/org_member_spec.rb diff --git a/app/assets/javascripts/organizations.js.coffee b/app/assets/javascripts/organizations.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/organizations.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/organizations.css.scss b/app/assets/stylesheets/organizations.css.scss new file mode 100644 index 000000000..39819880e --- /dev/null +++ b/app/assets/stylesheets/organizations.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the organizations controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb new file mode 100644 index 000000000..1d0edbd7e --- /dev/null +++ b/app/controllers/organizations_controller.rb @@ -0,0 +1,15 @@ +class OrganizationsController < ApplicationController + def new + @organization = Organization.new + render :layout => 'new_base' + end + def create + @organization = Organization.new + @organization.name = params[:organization][:name] + @organization.description = params[:organization][:description] + @organization.is_public = params[:organization][:is_public] + @organization.creator_id = User.current.id + member = OrgMember.new(:user_id => User.current.id, :role => 'Manager') + @organization.org_members << member + end +end diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 10321ba16..24cc9a80e 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -1,2 +1,2 @@ -module EnterprisesHelper +module OrganizationsHelper end diff --git a/app/models/org_member.rb b/app/models/org_member.rb new file mode 100644 index 000000000..c4be034fe --- /dev/null +++ b/app/models/org_member.rb @@ -0,0 +1,4 @@ +class OrgMember < ActiveRecord::Base + attr_accessible :organization_id, :role, :user_id + belongs_to :organization +end diff --git a/app/models/organization.rb b/app/models/organization.rb index 5f52dee98..39b5900d9 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -1,5 +1,5 @@ class Organization < ActiveRecord::Base - attr_accessible :logo_link, :name - + attr_accessible :name, :description, :creator_id, :home_id, :domain, :is_public + has_many :org_members, :dependent => :destroy has_many :projects end diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb index 6ab83d393..a2bbee9e3 100644 --- a/app/views/layouts/new_base.html.erb +++ b/app/views/layouts/new_base.html.erb @@ -13,7 +13,7 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify'%> + <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify', 'org'%> <%= javascript_include_tag "course","header",'prettify' %> <%= yield :header_tags -%> diff --git a/app/views/organizations/create.js.erb b/app/views/organizations/create.js.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb new file mode 100644 index 000000000..de8983f02 --- /dev/null +++ b/app/views/organizations/new.html.erb @@ -0,0 +1,95 @@ + +<% @nav_dispaly_organization_label = 1 + @nav_dispaly_forum_label = 1 %> +<%= error_messages_for 'organization' %> +
+

<%= l(:label_organization_new)%>

+
+
+ +
+
+ +<% html_title(l(:label_organization_new)) -%> + + + diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 61bad2a00..54f0fbdaf 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -288,6 +288,10 @@ zh: label_tags_project_name: "项目名称：" label_projects_new_name: "项目名称" label_tags_project_description: "项目描述" + + label_organization_name: "组织名称" + label_organization_description: "组织描述" + label_organization_new: "新建组织" label_tags_user_mail: "用户邮箱：" label_tags_user_name: "用户名：" diff --git a/config/routes.rb b/config/routes.rb index 9a6b48da2..0394cdb53 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,6 +31,8 @@ RedmineApp::Application.routes.draw do # Enable Grack support # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] + resources :organizations + resources :homework_users resources :no_uses delete 'no_uses', :to => 'no_uses#delete' diff --git a/db/migrate/20151102090519_create_org_members.rb b/db/migrate/20151103011119_create_org_members.rb similarity index 76% rename from db/migrate/20151102090519_create_org_members.rb rename to db/migrate/20151103011119_create_org_members.rb index 037d8a3c6..6ef208794 100644 --- a/db/migrate/20151102090519_create_org_members.rb +++ b/db/migrate/20151103011119_create_org_members.rb @@ -1,14 +1,11 @@ class CreateOrgMembers < ActiveRecord::Migration - def up + def change create_table :org_members do |t| t.integer :user_id t.integer :organization_id t.string :role + t.timestamps end end - - def down - drop_table :org_members - end end diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css new file mode 100644 index 000000000..b1dfbbcf0 --- /dev/null +++ b/public/stylesheets/org.css @@ -0,0 +1,6 @@ +@charset "utf-8"; +/* CSS Document */ + +.orgName {width:130px; color:#484848;} +.organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;} +.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} \ No newline at end of file diff --git a/spec/controllers/organizations_controller_spec.rb b/spec/controllers/organizations_controller_spec.rb new file mode 100644 index 000000000..cf00f4cf9 --- /dev/null +++ b/spec/controllers/organizations_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrganizationsController, :type => :controller do + +end diff --git a/spec/factories/org_members.rb b/spec/factories/org_members.rb new file mode 100644 index 000000000..90997fd30 --- /dev/null +++ b/spec/factories/org_members.rb @@ -0,0 +1,8 @@ +FactoryGirl.define do + factory :org_member do + user_id 1 +organization_id 1 +role "MyString" + end + +end diff --git a/spec/models/org_member_spec.rb b/spec/models/org_member_spec.rb new file mode 100644 index 000000000..e7058e5b3 --- /dev/null +++ b/spec/models/org_member_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgMember, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 3f289dcd74ead27f1afbcb0593e0416d5dedf654 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 3 Nov 2015 17:21:32 +0800 Subject: [PATCH 02/55] =?UTF-8?q?org=E5=BC=80=E5=8F=91=E9=83=A8=E5=88=86?= =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organization_controller.rb | 55 ------- app/controllers/organizations_controller.rb | 12 ++ app/views/layouts/base_org.html.erb | 157 ++++++++++++++++++++ app/views/organizations/show.html.erb | 4 + 4 files changed, 173 insertions(+), 55 deletions(-) delete mode 100644 app/controllers/organization_controller.rb create mode 100644 app/views/layouts/base_org.html.erb create mode 100644 app/views/organizations/show.html.erb diff --git a/app/controllers/organization_controller.rb b/app/controllers/organization_controller.rb deleted file mode 100644 index 748fc1732..000000000 --- a/app/controllers/organization_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class OrganizationController < ApplicationController - # layout 'base_projects' - before_filter :require_admin, :except => [:index] - - def index - #@projects = Project.find_by_sql("SELECT * FROM projects WHERE id IN (select MAX(id) from projects GROUP BY enterprise_name)") - @organizations = Organization.all - respond_to do |format| - format.html - end - end - - def new - @organizations = Organization.new - respond_to do |format| - format.html - end - end - - def create - @organizations = Organization.new - @organizations.name = params[:organization][:name] - if @organizations.save - redirect_to admin_organization_url - end - end - - def edit - @organization = Organization.find params[:id] - respond_to do |format| - format.html - end - rescue Exception => e - render_404 - end - - def update - @organization = Organization.find params[:id] - @organization.name = params[:organization][:name] - if @organization.save - redirect_to admin_organization_url - end - rescue Exception => e - render_404 - end - - def destroy - @organization = Organization.find params[:id] - if @organization.destroy - redirect_to admin_organization_url - end - rescue Exception => e - render_404 - end -end diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 1d0edbd7e..0def8b5f8 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,4 +1,5 @@ class OrganizationsController < ApplicationController + layout 'base_org' def new @organization = Organization.new render :layout => 'new_base' @@ -11,5 +12,16 @@ class OrganizationsController < ApplicationController @organization.creator_id = User.current.id member = OrgMember.new(:user_id => User.current.id, :role => 'Manager') @organization.org_members << member + if @organization.save + redirect_to organization_path(@organization) + end + end + + def show + + end + + def update + end end diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb new file mode 100644 index 000000000..a3829ea3b --- /dev/null +++ b/app/views/layouts/base_org.html.erb @@ -0,0 +1,157 @@ +<% @nav_dispaly_project_label = 1 + @nav_dispaly_forum_label = 1 %> +<%#@nav_dispaly_project_label = 1 %> + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %> + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + + + + +
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else %> + <%= render :partial => 'layouts/unlogin_header' %> + <% end %> +
+
+ <% @organization = Organization.find(params[:id])%> +
+
+
+
+ +
组织id:<%= @organization.id %>
+ 配置 +
+
文章 ( 3 ) | 成员 ( 10 )
+
+
+
动态
+
项目
+
+ +
+
+
+
+
+
最新动态
+ +
+
+
+
用户头像
+
+
尹教授 TO micROS研究团队 | 组织
+
如何打造一场罗永浩式的精彩演讲？
+
发帖时间：2015-11-02 11:25
+
罗永浩已经把他的主题演讲成功变成了一次次的重大的媒体事件，这让科技界和营销界的从业者们羡慕不已。事实上，老罗不仅从乔布斯那里继承了乔式审美，设计哲学，同时也继承了乔布斯的演讲艺术。乔布斯是人类历史上最伟大的演讲者。在一次又一次的"罗氏演讲"中，我们可以清晰看到老罗对乔布斯演讲的拆解，学习，模仿。每一次的公开演讲，都是一堂案例级的营销课程，值得每一位有志于从事营销相关的朋友分析研究。
+ 下面，我们将从"故事"、"现场"、"准备"三个方面分析学习老罗的演讲技巧，教你如何打造一场"罗永浩式"的演讲。
+
+ +
+
+
+
+
+
+
回复（2）
+ + +
+
+
用户头像
+
+
黄井泉 学生 2015-11-03 12:26
+
学习下！
+
+
+
+
+
用户头像
+
+
陈正东 学生 2015-11-02 17:08
+
锤子手机，卖的就是情怀
+
+
+
+
+
用户头像
+
+ + 发送
+
+
+
+
+
+
+
+
用户头像
+
+
唐湘政 创建了 micROS研究团队 + | 组织
+
micROS研究团队
+
创建时间：2015-10-29 11:23
+
+
+
+
+
+
+
+ +
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+ + +
+ <%= render :partial => 'layouts/footer' %> +
+ + + diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb new file mode 100644 index 000000000..9d38aedc1 --- /dev/null +++ b/app/views/organizations/show.html.erb @@ -0,0 +1,4 @@ +<%= javascript_include_tag "jquery.infinitescroll.js" %> +
+

组织活动

+
\ No newline at end of file From 283af137c69426b72e2857c1c440d242c5101c26 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 5 Nov 2015 17:57:07 +0800 Subject: [PATCH 03/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 47 ++- app/helpers/application_helper.rb | 9 + app/helpers/organizations_helper.rb | 17 + app/models/org_member.rb | 3 + app/models/org_member_role.rb | 5 + app/models/organization.rb | 10 +- app/models/principal.rb | 10 + app/models/project.rb | 4 +- app/models/role.rb | 2 + app/models/user.rb | 1 + app/views/layouts/base_org.html.erb | 191 +++++----- app/views/org_member/create.js.erb | 2 + app/views/org_member/destroy.js.erb | 1 + .../org_member/org_member_autocomplete.js.erb | 23 ++ app/views/org_member/update.js.erb | 1 + .../_new_org_avatar_form.html.erb | 33 ++ .../organizations/_org_member_list.html.erb | 44 +++ app/views/organizations/check_uniq.js.erb | 18 + app/views/organizations/new.html.erb | 25 +- app/views/organizations/setting.html.erb | 109 ++++++ app/views/organizations/show.html.erb | 39 +- config/routes.rb | 19 +- db/schema.rb | 349 +++++++++++++++++- public/javascripts/org.js | 34 ++ public/stylesheets/org.css | 29 +- 25 files changed, 918 insertions(+), 107 deletions(-) create mode 100644 app/models/org_member_role.rb create mode 100644 app/views/org_member/create.js.erb create mode 100644 app/views/org_member/destroy.js.erb create mode 100644 app/views/org_member/org_member_autocomplete.js.erb create mode 100644 app/views/org_member/update.js.erb create mode 100644 app/views/organizations/_new_org_avatar_form.html.erb create mode 100644 app/views/organizations/_org_member_list.html.erb create mode 100644 app/views/organizations/check_uniq.js.erb create mode 100644 app/views/organizations/setting.html.erb create mode 100644 public/javascripts/org.js diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 0def8b5f8..a51093ad9 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,5 +1,10 @@ +# encoding: utf-8 class OrganizationsController < ApplicationController + # before_filter :find_organization, :except => [:show,:new,:index,:create] layout 'base_org' + def index + + end def new @organization = Organization.new render :layout => 'new_base' @@ -10,18 +15,56 @@ class OrganizationsController < ApplicationController @organization.description = params[:organization][:description] @organization.is_public = params[:organization][:is_public] @organization.creator_id = User.current.id - member = OrgMember.new(:user_id => User.current.id, :role => 'Manager') + member = OrgMember.new(:user_id => User.current.id) + @organization.org_members << member if @organization.save + OrgMemberRole.create(:org_member_id => member.id, :role_id => 11) redirect_to organization_path(@organization) end end def show - + @organization = Organization.find(params[:id]) + @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?)', @organization.id, 'CreateOrganization ') + @activities = paginateHelper @activities, 10 end def update + @organization = Organization.find(params[:id]) + @organization.name = params[:organization][:name] + @organization.description = params[:organization][:description] + @organization.domain = params[:organization][:domain] + @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0 + #@organization.name = params[:organization][:name] + @organization.save + respond_to do |format| + format.html { redirect_to setting_organization_path(@organization)} + end + end + + def check_uniq + @check = false; + @config_page = params[:config_page] + sameName = @config_page ? Organization.where('name = ? and id != ?',params[:org_name],params[:org_id].to_i).count == 0 : Organization.where('name = ?',params[:org_name]).count == 0 + if sameName == true + @check = true + end + respond_to do |format| + format.js + end + end + + def find_organization + @organization = Organization.find(params[:id]) + end + + def setting + @organization = Organization.find(params[:id]) + end + + + def clear_org_avatar_temp end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 84364b4f6..dbf246141 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -48,6 +48,15 @@ module ApplicationHelper end end end + # 获取组织成员中文名字 + def get_org_member_role_name member + case member.roles[0].name + when 'orgManager' + '组织管理员' + when 'orgMember' + '组织成员' + end + end # Time 2015-03-24 16:38:05 # Author lizanle diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 24cc9a80e..e10d4026d 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -1,2 +1,19 @@ +# encoding: utf-8 module OrganizationsHelper + include ApplicationHelper + + + def find_user_not_in_current_org_by_name org + if params[:q] && params[:q].lstrip.rstrip != "" + scope = Principal.active.sorted.not_member_of_org(org).like(params[:q]) + else + scope = [] + end + principals = paginateHelper scope,10 + s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') + links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| + link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true + } + s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + end end diff --git a/app/models/org_member.rb b/app/models/org_member.rb index c4be034fe..091c20f22 100644 --- a/app/models/org_member.rb +++ b/app/models/org_member.rb @@ -1,4 +1,7 @@ class OrgMember < ActiveRecord::Base attr_accessible :organization_id, :role, :user_id belongs_to :organization + has_many :roles ,:through => :org_member_roles,:foreign_key => 'role_id' + has_many :org_member_roles,:dependent => :destroy + end diff --git a/app/models/org_member_role.rb b/app/models/org_member_role.rb new file mode 100644 index 000000000..0ce4f8141 --- /dev/null +++ b/app/models/org_member_role.rb @@ -0,0 +1,5 @@ +class OrgMemberRole < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :org_member + belongs_to :role +end diff --git a/app/models/organization.rb b/app/models/organization.rb index 39b5900d9..567df954c 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -1,5 +1,13 @@ class Organization < ActiveRecord::Base attr_accessible :name, :description, :creator_id, :home_id, :domain, :is_public has_many :org_members, :dependent => :destroy - has_many :projects + has_many :org_projects ,:dependent => :destroy + has_many :projects,:through => :org_projects + has_many :org_document_comments, :dependent => :destroy + validates_uniqueness_of :name + after_create :save_as_org_activity + + def save_as_org_activity + OrgActivity.create(:user_id => User.current.id, :org_act_id => self.id, :org_act_type => 'CreateOrganization', :container_id => self.id, :container_type => 'Organization') + end end diff --git a/app/models/principal.rb b/app/models/principal.rb index 0f0746f78..fc9c7cac4 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -87,6 +87,16 @@ class Principal < ActiveRecord::Base end } + scope :not_member_of_org, lambda {|org| + orgs = [org] unless org.is_a?(Array) + if orgs.empty? + where("1=0") + else + ids = orgs.map(&:id) + where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{OrgMember.table_name} WHERE organization_id IN (?))", ids) + end + } + scope :sorted, lambda { order(*Principal.fields_for_order_statement)} scope :applied_members, lambda {|project| diff --git a/app/models/project.rb b/app/models/project.rb index fd1012fa0..0b0420920 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -69,6 +69,7 @@ class Project < ActiveRecord::Base has_many :applied_projects, :dependent => :destroy has_many :invite_lists, :dependent => :destroy has_one :dts + has_many :organizations,:through => :org_projects # end #ADDED BY NIE @@ -96,7 +97,8 @@ class Project < ActiveRecord::Base # 关联虚拟表 has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy - belongs_to :organization + has_many :org_projects,:dependent => :destroy + has_many :organization,:through => :org_projects # has_many :journals diff --git a/app/models/role.rb b/app/models/role.rb index 8bf5ebc05..f6a24a27f 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -55,6 +55,8 @@ class Role < ActiveRecord::Base has_many :member_roles, :dependent => :destroy has_many :members, :through => :member_roles + has_many :org_member_roles, :dependent => :destroy + has_many :org_members,:through => :org_member_roles acts_as_list serialize :permissions, ::Role::PermissionsAttributeCoder diff --git a/app/models/user.rb b/app/models/user.rb index edc29c015..4c6449863 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -94,6 +94,7 @@ class User < Principal has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'" has_one :blog, :class_name => 'Blog', :foreign_key => "author_id" + has_many :org_document_comments, :dependent =>:destroy has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id #huang diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index a3829ea3b..d84bd5e8c 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -12,8 +12,8 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository' %> - <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move' %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -35,11 +35,24 @@
- @@ -59,94 +72,94 @@
-
-
最新动态
- -
-
-
-
用户头像
-
-
尹教授 TO micROS研究团队 | 组织
-
如何打造一场罗永浩式的精彩演讲？
-
发帖时间：2015-11-02 11:25
-
罗永浩已经把他的主题演讲成功变成了一次次的重大的媒体事件，这让科技界和营销界的从业者们羡慕不已。事实上，老罗不仅从乔布斯那里继承了乔式审美，设计哲学，同时也继承了乔布斯的演讲艺术。乔布斯是人类历史上最伟大的演讲者。在一次又一次的"罗氏演讲"中，我们可以清晰看到老罗对乔布斯演讲的拆解，学习，模仿。每一次的公开演讲，都是一堂案例级的营销课程，值得每一位有志于从事营销相关的朋友分析研究。
- 下面，我们将从"故事"、"现场"、"准备"三个方面分析学习老罗的演讲技巧，教你如何打造一场"罗永浩式"的演讲。
-
- -
-
-
-
-
-
-
回复（2）
- - -
-
-
用户头像
-
-
黄井泉 学生 2015-11-03 12:26
-
学习下！
-
-
-
-
-
用户头像
-
-
陈正东 学生 2015-11-02 17:08
-
锤子手机，卖的就是情怀
-
-
-
-
-
用户头像
-
- - 发送
-
-
-
-
-
-
-
-
用户头像
-
-
唐湘政 创建了 micROS研究团队 - | 组织
-
micROS研究团队
-
创建时间：2015-10-29 11:23
-
-
-
-
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
-
diff --git a/app/views/org_member/create.js.erb b/app/views/org_member/create.js.erb new file mode 100644 index 000000000..d3e8c144e --- /dev/null +++ b/app/views/org_member/create.js.erb @@ -0,0 +1,2 @@ +$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); +$("#principals_for_new_member").html('') \ No newline at end of file diff --git a/app/views/org_member/destroy.js.erb b/app/views/org_member/destroy.js.erb new file mode 100644 index 000000000..8bd949fde --- /dev/null +++ b/app/views/org_member/destroy.js.erb @@ -0,0 +1 @@ +$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/org_member/org_member_autocomplete.js.erb b/app/views/org_member/org_member_autocomplete.js.erb new file mode 100644 index 000000000..b1672038a --- /dev/null +++ b/app/views/org_member/org_member_autocomplete.js.erb @@ -0,0 +1,23 @@ +<% if @org%> + var checked = $("#not_org_members input:checked").size(); + if(checked > 0) + { + alert('翻页或搜索后将丢失当前选择的用户数据!'); + } + <% if @flag == "true"%> + $('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>'); + <% else%> + $('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>'); + <% end%> + +<%end%> +var collection=$("#principals_for_new_member").children("#principals").children("label"); +collection.css("text-overflow","ellipsis"); +collection.css("white-space","nowrap"); +collection.css("width","200px"); +collection.css("overflow","hidden"); +for(i=0;i"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/organizations/_new_org_avatar_form.html.erb b/app/views/organizations/_new_org_avatar_form.html.erb new file mode 100644 index 000000000..8b80641e8 --- /dev/null +++ b/app/views/organizations/_new_org_avatar_form.html.erb @@ -0,0 +1,33 @@ + + + + +<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> + +<%= file_field_tag 'avatar[image]', + :id => 'upload_org_logo', + :class => 'undis upload_file', + :size => "1", + :multiple => true, + :data => { + :max_file_size => Setting.upload_avatar_max_size, + :max_file_size_message => l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :file_type => Redmine::Configuration['pic_types'].to_s, + :type_support_message => l(:error_pic_type), + :upload_path => upload_avatar_path(:format => 'js'), + :description_placeholder => nil ,# l(:label_optional_description) + :source_type => source.class.to_s, + :source_id => source.id.to_s + } %> + +<% content_for :header_tags do %> + <%= javascript_include_tag 'jq-upload/jquery.ui.widget', 'jq-upload/jquery.iframe-transport', 'jq-upload/jquery.fileupload', 'jq-upload/upload' %> +<% end %> +
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb new file mode 100644 index 000000000..23a31fab3 --- /dev/null +++ b/app/views/organizations/_org_member_list.html.erb @@ -0,0 +1,44 @@ +<% members.each do |member|%> +
    +
  • <%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %>
    • +
  • + <%= get_org_member_role_name member %> + <%= form_for(member, {:as => :org_member, :remote => true, :url => org_member_path(member), + :method => :put, + :html => {:id => "org-member-#{member.id}-roles-form", :style=>'display:none'}} + ) do |f| %> + <% Role.givable.where("id in (11,12)").each do |role| %> +
      + <%= radio_button_tag 'org_member[role_ids][]', role.id, member.roles.include?(role) %> + + <% if User.current.language == "zh" %> + <% if role.id == 11 %> + + <% elsif role.id == 12 %> + + <% end %> + <% else %> + + <% end %> +
    + + <% end %> + <%= hidden_field_tag 'membership[role_ids][]', '' %> +
    + + <%= l(:button_change)%> + + + <%= l(:button_cancel)%> + +
    + <% end %> +
    • +
  • + + <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> + 编辑 | <%= link_to '删除', org_member_path(member.id),:method=>'delete', :remote => true %><% end %> +
    • +
    +
+<% end %> \ No newline at end of file diff --git a/app/views/organizations/check_uniq.js.erb b/app/views/organizations/check_uniq.js.erb new file mode 100644 index 000000000..2d295c4d1 --- /dev/null +++ b/app/views/organizations/check_uniq.js.erb @@ -0,0 +1,18 @@ +<%if @check == false %> + $checkName = false + <% if @config_page%> + $("#check_name_hint").html('名字不能重复').show(); + <% else%> + $("#organization_name_notice").html('名字不能重复').show(); + + <%end%> + +<% else %> + $checkName = true; + <% if @config_page%> + $("#check_name_hint").html('名字可以使用').show(); + <% else%> + + $("#organization_name_notice").html('名字可以使用').show(); + <%end%> +<%end%> \ No newline at end of file diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index de8983f02..2496ac133 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -12,8 +12,8 @@ - - + +
@@ -55,20 +55,35 @@ var name = $.trim($("#organization_name").val()); if(name.length == 0) { - $("#organization_name_notice").show(); + $("#organization_name_notice").html('名字不能为空').show(); return false; } else { - $("#organization_name_notice").hide(); + $("#organization_name_notice").html('').hide(); return true; } } + var $checkName = false; + + function check_uniq(dom){ + if($("#organization_name").val().trim() == ""){ + $("#organization_name_notice").html('名字不能为空').show(); + return; + } + $.get( + '<%= check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim() + ) + } + //提交新建项目 function submit_new_organization() { - if(regex_organization_name()) + $.get( + '<%= check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim() + ) + if(regex_organization_name() && $checkName) { $("#new_organization").submit(); } diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb new file mode 100644 index 000000000..61e6b1534 --- /dev/null +++ b/app/views/organizations/setting.html.erb @@ -0,0 +1,109 @@ + +
+
配置
+
+
+
    +
  • 信息
    • +
  • 成员
    • +
  • +
    +
+
+ + + <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %> + <%= labelled_form_for @organization do |f|%> + <%= render :partial=>"new_org_avatar_form",:locals=> {source:@organization} %> + + +
* 组织名称： + +
+
+
+
组织描述： + +
+
+
+
组织URL： +
https：// + + .trustie.net申请 +

+ +
+
+
公开 : + class="ml3" /> +
+ 保存 + <% end %> +
+
+
+
    +
  • 用户
    • +
  • 角色
    • +
  • +
    +
+
+ <%= render :partial=>"org_member_list",:locals=> {:members=>@organization.org_members} %> +
+
+
+
+

添加成员

+ <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%> + + <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %> +
+ <%= find_user_not_in_current_org_by_name(@project) %> +
+
    +
  • 角色
    • +
  • + + +
    • +
  • + + +
    • +
新增成员 + <% end %> +
+
+
+
+
\ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 9d38aedc1..2f25ae8a3 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,4 +1,37 @@ <%= javascript_include_tag "jquery.infinitescroll.js" %> -
-

组织活动

-
\ No newline at end of file + +
+
最新动态
+ +
+ <% unless @activities.nil? %> + <% @activities.each do |act| %> + <% if act.org_act_type == 'CreateOrganization' %> +
+
+
+ <%= image_tag(url_to_avatar(User.find(act.user_id)), :width => "45", :height => "45") %> +
+
+
<%= link_to User.find(act.user_id), user_path(act.user_id) %>  创建了 <%= Organization.find(act.org_act_id).name %> + | 组织
+
创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %>
+
+
+
+
+ <% end %> + <% end %> +
    + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
+ <% end %> + + diff --git a/config/routes.rb b/config/routes.rb index 0394cdb53..639056b94 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,7 +31,24 @@ RedmineApp::Application.routes.draw do # Enable Grack support # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] - resources :organizations + resources :organizations do + member do + get 'setting'#, :action => 'settings', :as => 'settings' + get 'clear_org_avatar_temp' + end + collection do + get 'check_uniq' + end + end + + resources :org_member do + member do + + end + collection do + get 'org_member_autocomplete' + end + end resources :homework_users resources :no_uses diff --git a/db/schema.rb b/db/schema.rb index 4b6d7ab5d..d75b4f7a4 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 => 20151029030006) do +ActiveRecord::Schema.define(:version => 20151104090032) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -293,6 +293,16 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.boolean "diff_all" end + create_table "columns_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Table_name", :limit => 64, :default => "", :null => false + t.string "Column_name", :limit => 64, :default => "", :null => false + t.timestamp "Timestamp", :null => false + t.string "Column_priv", :limit => 0, :default => "", :null => false + end + create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -491,6 +501,33 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" + create_table "db", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Select_priv", :limit => 1, :default => "N", :null => false + t.string "Insert_priv", :limit => 1, :default => "N", :null => false + t.string "Update_priv", :limit => 1, :default => "N", :null => false + t.string "Delete_priv", :limit => 1, :default => "N", :null => false + t.string "Create_priv", :limit => 1, :default => "N", :null => false + t.string "Drop_priv", :limit => 1, :default => "N", :null => false + t.string "Grant_priv", :limit => 1, :default => "N", :null => false + t.string "References_priv", :limit => 1, :default => "N", :null => false + t.string "Index_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false + t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false + t.string "Create_view_priv", :limit => 1, :default => "N", :null => false + t.string "Show_view_priv", :limit => 1, :default => "N", :null => false + t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Execute_priv", :limit => 1, :default => "N", :null => false + t.string "Event_priv", :limit => 1, :default => "N", :null => false + t.string "Trigger_priv", :limit => 1, :default => "N", :null => false + end + + add_index "db", ["User"], :name => "User" + create_table "delayed_jobs", :force => true do |t| t.integer "priority", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false @@ -572,6 +609,31 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + create_table "event", :id => false, :force => true do |t| + t.string "db", :limit => 64, :default => "", :null => false + t.string "name", :limit => 64, :default => "", :null => false + t.binary "body", :limit => 2147483647, :null => false + t.string "definer", :limit => 77, :default => "", :null => false + t.datetime "execute_at" + t.integer "interval_value" + t.string "interval_field", :limit => 18 + t.timestamp "created", :null => false + t.timestamp "modified", :null => false + t.datetime "last_executed" + t.datetime "starts" + t.datetime "ends" + t.string "status", :limit => 18, :default => "ENABLED", :null => false + t.string "on_completion", :limit => 8, :default => "DROP", :null => false + t.string "sql_mode", :limit => 0, :default => "", :null => false + t.string "comment", :limit => 64, :default => "", :null => false + t.integer "originator", :null => false + t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false + t.string "character_set_client", :limit => 32 + t.string "collation_connection", :limit => 32 + t.string "db_collation", :limit => 32 + t.binary "body_utf8", :limit => 2147483647 + end + create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -623,6 +685,21 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "locked" end + create_table "func", :primary_key => "name", :force => true do |t| + t.boolean "ret", :default => false, :null => false + t.string "dl", :limit => 128, :default => "", :null => false + t.string "type", :limit => 9, :null => false + end + + create_table "general_log", :id => false, :force => true do |t| + t.timestamp "event_time", :null => false + t.text "user_host", :limit => 16777215, :null => false + t.integer "thread_id", :null => false + t.integer "server_id", :null => false + t.string "command_type", :limit => 64, :null => false + t.text "argument", :limit => 16777215, :null => false + end + create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -630,6 +707,35 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true + create_table "help_category", :primary_key => "help_category_id", :force => true do |t| + t.string "name", :limit => 64, :null => false + t.integer "parent_category_id", :limit => 2 + t.text "url", :null => false + end + + add_index "help_category", ["name"], :name => "name", :unique => true + + create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t| + t.string "name", :limit => 64, :null => false + end + + add_index "help_keyword", ["name"], :name => "name", :unique => true + + create_table "help_relation", :id => false, :force => true do |t| + t.integer "help_topic_id", :null => false + t.integer "help_keyword_id", :null => false + end + + create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t| + t.string "name", :limit => 64, :null => false + t.integer "help_category_id", :limit => 2, :null => false + t.text "description", :null => false + t.text "example", :null => false + t.text "url", :null => false + end + + add_index "help_topic", ["name"], :name => "name", :unique => true + create_table "homework_attaches", :force => true do |t| t.integer "bid_id" t.integer "user_id" @@ -714,6 +820,29 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.datetime "updated_at", :null => false end + create_table "host", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "Select_priv", :limit => 1, :default => "N", :null => false + t.string "Insert_priv", :limit => 1, :default => "N", :null => false + t.string "Update_priv", :limit => 1, :default => "N", :null => false + t.string "Delete_priv", :limit => 1, :default => "N", :null => false + t.string "Create_priv", :limit => 1, :default => "N", :null => false + t.string "Drop_priv", :limit => 1, :default => "N", :null => false + t.string "Grant_priv", :limit => 1, :default => "N", :null => false + t.string "References_priv", :limit => 1, :default => "N", :null => false + t.string "Index_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false + t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false + t.string "Create_view_priv", :limit => 1, :default => "N", :null => false + t.string "Show_view_priv", :limit => 1, :default => "N", :null => false + t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Execute_priv", :limit => 1, :default => "N", :null => false + t.string "Trigger_priv", :limit => 1, :default => "N", :null => false + end + create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -943,6 +1072,15 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" + create_table "ndb_binlog_index", :primary_key => "epoch", :force => true do |t| + t.integer "Position", :limit => 8, :null => false + t.string "File", :null => false + t.integer "inserts", :limit => 8, :null => false + t.integer "updates", :limit => 8, :null => false + t.integer "deletes", :limit => 8, :null => false + t.integer "schemaops", :limit => 8, :null => false + end + create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1037,11 +1175,53 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "project_id" end + create_table "org_activities", :force => true do |t| + t.integer "user_id" + t.integer "org_act_id" + t.string "org_act_type" + t.integer "container_id" + t.string "container_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "org_document_comments", :force => true do |t| + t.string "title" + t.text "content" + t.integer "organization_id" + t.integer "creator_id" + t.integer "parent_id" + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + end + + create_table "org_member_roles", :force => true do |t| + t.integer "org_member_id" + t.integer "role_id" + end + + create_table "org_members", :force => true do |t| + t.integer "user_id" + t.integer "organization_id" + end + + create_table "org_projects", :force => true do |t| + t.integer "organization_id" + t.integer "project_id" + end + create_table "organizations", :force => true do |t| t.string "name" - t.string "logo_link" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.text "description" + t.integer "creator_id" + t.integer "home_id" + t.string "domain" + t.boolean "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "phone_app_versions", :force => true do |t| @@ -1051,6 +1231,10 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.datetime "updated_at", :null => false end + create_table "plugin", :primary_key => "name", :force => true do |t| + t.string "dl", :limit => 128, :default => "", :null => false + end + create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -1126,6 +1310,42 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.datetime "updated_at", :null => false end + create_table "proc", :id => false, :force => true do |t| + t.string "db", :limit => 64, :default => "", :null => false + t.string "name", :limit => 64, :default => "", :null => false + t.string "type", :limit => 9, :null => false + t.string "specific_name", :limit => 64, :default => "", :null => false + t.string "language", :limit => 3, :default => "SQL", :null => false + t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false + t.string "is_deterministic", :limit => 3, :default => "NO", :null => false + t.string "security_type", :limit => 7, :default => "DEFINER", :null => false + t.binary "param_list", :null => false + t.binary "returns", :limit => 2147483647, :null => false + t.binary "body", :limit => 2147483647, :null => false + t.string "definer", :limit => 77, :default => "", :null => false + t.timestamp "created", :null => false + t.timestamp "modified", :null => false + t.string "sql_mode", :limit => 0, :default => "", :null => false + t.text "comment", :null => false + t.string "character_set_client", :limit => 32 + t.string "collation_connection", :limit => 32 + t.string "db_collation", :limit => 32 + t.binary "body_utf8", :limit => 2147483647 + end + + create_table "procs_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Routine_name", :limit => 64, :default => "", :null => false + t.string "Routine_type", :limit => 9, :null => false + t.string "Grantor", :limit => 77, :default => "", :null => false + t.string "Proc_priv", :limit => 0, :default => "", :null => false + t.timestamp "Timestamp", :null => false + end + + add_index "procs_priv", ["Grantor"], :name => "Grantor" + create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1200,6 +1420,18 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" + create_table "proxies_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Proxied_host", :limit => 60, :default => "", :null => false + t.string "Proxied_user", :limit => 16, :default => "", :null => false + t.boolean "With_grant", :default => false, :null => false + t.string "Grantor", :limit => 77, :default => "", :null => false + t.timestamp "Timestamp", :null => false + end + + add_index "proxies_priv", ["Grantor"], :name => "Grantor" + create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1313,6 +1545,17 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "is_teacher_score", :default => 0 end + create_table "servers", :primary_key => "Server_name", :force => true do |t| + t.string "Host", :limit => 64, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "Username", :limit => 64, :default => "", :null => false + t.string "Password", :limit => 64, :default => "", :null => false + t.integer "Port", :default => 0, :null => false + t.string "Socket", :limit => 64, :default => "", :null => false + t.string "Wrapper", :limit => 64, :default => "", :null => false + t.string "Owner", :limit => 64, :default => "", :null => false + end + create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1333,6 +1576,20 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.string "description" end + create_table "slow_log", :id => false, :force => true do |t| + t.timestamp "start_time", :null => false + t.text "user_host", :limit => 16777215, :null => false + t.time "query_time", :null => false + t.time "lock_time", :null => false + t.integer "rows_sent", :null => false + t.integer "rows_examined", :null => false + t.string "db", :limit => 512, :null => false + t.integer "last_insert_id", :null => false + t.integer "insert_id", :null => false + t.integer "server_id", :null => false + t.text "sql_text", :limit => 16777215, :null => false + end + create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -1414,6 +1671,19 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.string "subject" end + create_table "tables_priv", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "Db", :limit => 64, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Table_name", :limit => 64, :default => "", :null => false + t.string "Grantor", :limit => 77, :default => "", :null => false + t.timestamp "Timestamp", :null => false + t.string "Table_priv", :limit => 0, :default => "", :null => false + t.string "Column_priv", :limit => 0, :default => "", :null => false + end + + add_index "tables_priv", ["Grantor"], :name => "Grantor" + create_table "taggings", :force => true do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1463,6 +1733,32 @@ ActiveRecord::Schema.define(:version => 20151029030006) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" + create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t| + t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false + end + + create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t| + t.integer "Correction", :null => false + end + + create_table "time_zone_name", :primary_key => "Name", :force => true do |t| + t.integer "Time_zone_id", :null => false + end + + create_table "time_zone_transition", :id => false, :force => true do |t| + t.integer "Time_zone_id", :null => false + t.integer "Transition_time", :limit => 8, :null => false + t.integer "Transition_type_id", :null => false + end + + create_table "time_zone_transition_type", :id => false, :force => true do |t| + t.integer "Time_zone_id", :null => false + t.integer "Transition_type_id", :null => false + t.integer "Offset", :default => 0, :null => false + t.integer "Is_DST", :limit => 1, :default => 0, :null => false + t.string "Abbreviation", :limit => 8, :default => "", :null => false + end + create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -1481,6 +1777,51 @@ ActiveRecord::Schema.define(:version => 20151029030006) do t.integer "fields_bits", :default => 0 end + create_table "user", :id => false, :force => true do |t| + t.string "Host", :limit => 60, :default => "", :null => false + t.string "User", :limit => 16, :default => "", :null => false + t.string "Password", :limit => 41, :default => "", :null => false + t.string "Select_priv", :limit => 1, :default => "N", :null => false + t.string "Insert_priv", :limit => 1, :default => "N", :null => false + t.string "Update_priv", :limit => 1, :default => "N", :null => false + t.string "Delete_priv", :limit => 1, :default => "N", :null => false + t.string "Create_priv", :limit => 1, :default => "N", :null => false + t.string "Drop_priv", :limit => 1, :default => "N", :null => false + t.string "Reload_priv", :limit => 1, :default => "N", :null => false + t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false + t.string "Process_priv", :limit => 1, :default => "N", :null => false + t.string "File_priv", :limit => 1, :default => "N", :null => false + t.string "Grant_priv", :limit => 1, :default => "N", :null => false + t.string "References_priv", :limit => 1, :default => "N", :null => false + t.string "Index_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_priv", :limit => 1, :default => "N", :null => false + t.string "Show_db_priv", :limit => 1, :default => "N", :null => false + t.string "Super_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false + t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false + t.string "Execute_priv", :limit => 1, :default => "N", :null => false + t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false + t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false + t.string "Create_view_priv", :limit => 1, :default => "N", :null => false + t.string "Show_view_priv", :limit => 1, :default => "N", :null => false + t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false + t.string "Create_user_priv", :limit => 1, :default => "N", :null => false + t.string "Event_priv", :limit => 1, :default => "N", :null => false + t.string "Trigger_priv", :limit => 1, :default => "N", :null => false + t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false + t.string "ssl_type", :limit => 9, :default => "", :null => false + t.binary "ssl_cipher", :null => false + t.binary "x509_issuer", :null => false + t.binary "x509_subject", :null => false + t.integer "max_questions", :default => 0, :null => false + t.integer "max_updates", :default => 0, :null => false + t.integer "max_connections", :default => 0, :null => false + t.integer "max_user_connections", :default => 0, :null => false + t.string "plugin", :limit => 64, :default => "" + t.text "authentication_string" + end + create_table "user_activities", :force => true do |t| t.string "act_type" t.integer "act_id" diff --git a/public/javascripts/org.js b/public/javascripts/org.js new file mode 100644 index 000000000..f74277a9e --- /dev/null +++ b/public/javascripts/org.js @@ -0,0 +1,34 @@ +//֯Աύ +function submit_add_org_members(){ + $("#org_member_add_form").submit(); +} + +function observeSearchfield(fieldId, targetId, url) { + $('#'+fieldId).each(function() { + var $this = $(this); + $this.addClass('autocomplete'); + $this.attr('data-value-was', $this.val()); + var check = function() { + var val = $this.val(); + if ($this.attr('data-value-was') != val){ + $this.attr('data-value-was', val); + $.ajax({ + url: url, + type: 'get', + data: {q: $this.val()}, + success: function(data){ if(targetId) $('#'+targetId).html(data); }, + beforeSend: function(){ $this.addClass('ajax-loading'); }, + complete: function(){ $this.removeClass('ajax-loading'); } + }); + } + }; + var reset = function() { + if (timer) { + clearInterval(timer); + timer = setInterval(check, 300); + } + }; + var timer = setInterval(check, 300); + $this.bind('keyup click mousemove', reset); + }); +} \ No newline at end of file diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index b1dfbbcf0..8d9275f31 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -3,4 +3,31 @@ .orgName {width:130px; color:#484848;} .organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;} -.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} \ No newline at end of file +.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} + +.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} +.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;} +.logoBorder {border:1px solid #eaeaea; padding:2px;} +.logoBorder:hover {border:1px solid #269ac9;} +.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;} +.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;} +.orgRow {font-size:14px; color:#484848;} +.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;} +.w607 {width:607px;} +.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} +a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} +a.saveBtn:hover {background-color:#297fb8;} +.orgMemberList {width:410px; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} +.orgListUser {width:125px; float:left;} +.orgListRole {width:285px; float:left;} +.orgMemContainer {width:278px;} +.orgMemberAdd {float:right; width:240px;} +.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} +.undis {display:none;} +.dis {display:inline-block;} +.upbtn { margin: 40px 0px 0px 15px; + display: block; + padding: 2px 5px; + border: 1px solid #EAEAEA;} \ No newline at end of file From 6dd264990e08efaece2ee5605d9c9eeb98f7a43e Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 15:27:59 +0800 Subject: [PATCH 04/55] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_evaluation_un_work.html.erb | 15 ++++++++++++--- .../student_work/_evaluation_work.html.erb | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index ebe3d4cc6..2a0962244 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -5,7 +5,7 @@
  • <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
    • -
    +
  • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
    @@ -25,7 +25,7 @@
    • -
  • +
  • <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> @@ -80,6 +80,15 @@
    • <% end%> - + + diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 81d868a50..e336b0282 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -7,13 +7,13 @@
  • <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
    • -
  • +
  • <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
    <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
    • -
  • +
    • <%= student_work.user.show_name%> @@ -27,12 +27,12 @@
    • <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
      • -
    • +
    • <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
      • -
    • +
      • 匿名 @@ -46,7 +46,7 @@
      • -
    • +
    • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] @@ -58,6 +58,13 @@
    • <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
      • - +
    + From 7dd299255bc8edf11fd0f11c2a81ba1287ab9817 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 11 Nov 2015 17:16:19 +0800 Subject: [PATCH 05/55] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 4 ++-- app/views/blogs/_article_list.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 54c9541f2..cf24f0f2d 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -28,7 +28,7 @@ showNormalImage('message_description_<%= @article.id %>'); }); -
    +
    <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %> @@ -165,7 +165,7 @@ <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> - <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %> + <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10 mb10", :style => "margin-right: 5px;" %> <% end %>
    diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index e397da2cc..b8bcc9ad0 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -32,7 +32,7 @@ <%#end%> -
    +
    <%= @user.name%>的博客 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ea45fdbd0..7d8944094 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -261,7 +261,7 @@ a:hover.grey_n_btn{ background:#717171; color:#fff;} .green_btn{ background:#28be6c; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;} a.green_btn{background:#28be6c;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.green_btn{ background:#14ad5a;} -.blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 8px; text-align:center;} +.blue_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 8px; text-align:center;} a.blue_btn{background:#64bdd9;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.blue_btn{ background:#329cbd;} a.orange_btn{ background:#ff5722;color:#fff; font-weight:normal; padding:2px 10px; text-align:center; } From a3443ba968934dc56ac703c11bf00558f6893508 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 09:32:00 +0800 Subject: [PATCH 06/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comment.js.coffee | 3 + app/assets/javascripts/org_member.js.coffee | 3 + app/assets/javascripts/org_projects.js.coffee | 3 + .../stylesheets/org_document_comment.css.scss | 3 + app/assets/stylesheets/org_member.css.scss | 3 + app/assets/stylesheets/org_projects.css.scss | 3 + .../org_document_comments_controller.rb | 54 +++++++++ app/controllers/org_member_controller.rb | 53 +++++++++ app/controllers/org_projects_controller.rb | 18 +++ app/controllers/organizations_controller.rb | 19 ++- app/controllers/projects_controller.rb | 28 ++++- app/helpers/org_document_comment_helper.rb | 2 + app/helpers/org_member_helper.rb | 16 +++ app/helpers/org_projects_helper.rb | 2 + app/helpers/organizations_helper.rb | 1 + app/models/org_activity.rb | 5 + app/models/org_document_comment.rb | 16 +++ app/models/org_project.rb | 5 + app/views/layouts/base_org.html.erb | 91 ++------------- app/views/my/account.html.erb | 10 +- app/views/org_document_comments/_new.html.erb | 40 +++++++ .../org_document_comments/add_reply.js.erb | 3 + .../org_document_comments/destroy.js.erb | 1 + .../org_document_comments/index.html.erb | 26 +++++ app/views/org_document_comments/new.html.erb | 40 +++++++ app/views/org_document_comments/show.html.erb | 0 app/views/org_projects/create.js.erb | 4 + app/views/org_projects/destroy.js.erb | 2 + app/views/organization/_form.html.erb | 21 ---- app/views/organization/edit.html.erb | 25 ---- app/views/organization/index.html.erb | 31 ----- app/views/organization/new.html.erb | 18 --- .../organizations/_show_org_document.html.erb | 90 +++++++++++++++ .../organizations/autocomplete_search.js.erb | 13 +++ app/views/organizations/set_homepage.js.erb | 1 + app/views/organizations/setting.html.erb | 3 +- app/views/organizations/show.html.erb | 7 +- app/views/projects/settings.html.erb | 6 + .../projects/settings/_added_orgs.html.erb | 9 ++ .../projects/settings/_join_org.html.erb | 108 ++++++++++++++++++ config/routes.rb | 30 +++++ ...1104020233_create_org_document_comments.rb | 13 +++ ..._column_to_entity_org_document_comments.rb | 6 + .../20151104032831_create_org_activity.rb | 16 +++ .../20151104070007_create_org_projects.rb | 11 ++ ...455_delete_column_role_from_org_members.rb | 8 ++ ...04073902_rename_column_for_org_activity.rb | 6 + .../20151104090032_create_org_member_roles.rb | 11 ++ .../20151110011003_add_time_to_org_project.rb | 5 + db/schema.rb | 7 +- public/stylesheets/org.css | 13 ++- .../org_document_comment_controller_spec.rb | 5 + .../controllers/org_member_controller_spec.rb | 5 + .../org_projects_controller_spec.rb | 5 + spec/factories/org_activities.rb | 6 + spec/factories/org_document_comments.rb | 11 ++ spec/models/org_activity_spec.rb | 5 + spec/models/org_document_comment_spec.rb | 5 + 58 files changed, 761 insertions(+), 193 deletions(-) create mode 100644 app/assets/javascripts/org_document_comment.js.coffee create mode 100644 app/assets/javascripts/org_member.js.coffee create mode 100644 app/assets/javascripts/org_projects.js.coffee create mode 100644 app/assets/stylesheets/org_document_comment.css.scss create mode 100644 app/assets/stylesheets/org_member.css.scss create mode 100644 app/assets/stylesheets/org_projects.css.scss create mode 100644 app/controllers/org_document_comments_controller.rb create mode 100644 app/controllers/org_member_controller.rb create mode 100644 app/controllers/org_projects_controller.rb create mode 100644 app/helpers/org_document_comment_helper.rb create mode 100644 app/helpers/org_member_helper.rb create mode 100644 app/helpers/org_projects_helper.rb create mode 100644 app/models/org_activity.rb create mode 100644 app/models/org_document_comment.rb create mode 100644 app/models/org_project.rb create mode 100644 app/views/org_document_comments/_new.html.erb create mode 100644 app/views/org_document_comments/add_reply.js.erb create mode 100644 app/views/org_document_comments/destroy.js.erb create mode 100644 app/views/org_document_comments/index.html.erb create mode 100644 app/views/org_document_comments/new.html.erb create mode 100644 app/views/org_document_comments/show.html.erb create mode 100644 app/views/org_projects/create.js.erb create mode 100644 app/views/org_projects/destroy.js.erb delete mode 100644 app/views/organization/_form.html.erb delete mode 100644 app/views/organization/edit.html.erb delete mode 100644 app/views/organization/index.html.erb delete mode 100644 app/views/organization/new.html.erb create mode 100644 app/views/organizations/_show_org_document.html.erb create mode 100644 app/views/organizations/autocomplete_search.js.erb create mode 100644 app/views/organizations/set_homepage.js.erb create mode 100644 app/views/projects/settings/_added_orgs.html.erb create mode 100644 app/views/projects/settings/_join_org.html.erb create mode 100644 db/migrate/20151104020233_create_org_document_comments.rb create mode 100644 db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb create mode 100644 db/migrate/20151104032831_create_org_activity.rb create mode 100644 db/migrate/20151104070007_create_org_projects.rb create mode 100644 db/migrate/20151104070455_delete_column_role_from_org_members.rb create mode 100644 db/migrate/20151104073902_rename_column_for_org_activity.rb create mode 100644 db/migrate/20151104090032_create_org_member_roles.rb create mode 100644 db/migrate/20151110011003_add_time_to_org_project.rb create mode 100644 spec/controllers/org_document_comment_controller_spec.rb create mode 100644 spec/controllers/org_member_controller_spec.rb create mode 100644 spec/controllers/org_projects_controller_spec.rb create mode 100644 spec/factories/org_activities.rb create mode 100644 spec/factories/org_document_comments.rb create mode 100644 spec/models/org_activity_spec.rb create mode 100644 spec/models/org_document_comment_spec.rb diff --git a/app/assets/javascripts/org_document_comment.js.coffee b/app/assets/javascripts/org_document_comment.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_document_comment.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/org_member.js.coffee b/app/assets/javascripts/org_member.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_member.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/org_projects.js.coffee b/app/assets/javascripts/org_projects.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/org_projects.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/org_document_comment.css.scss b/app/assets/stylesheets/org_document_comment.css.scss new file mode 100644 index 000000000..9359415ae --- /dev/null +++ b/app/assets/stylesheets/org_document_comment.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the org_document_comment controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/org_member.css.scss b/app/assets/stylesheets/org_member.css.scss new file mode 100644 index 000000000..4bab7e008 --- /dev/null +++ b/app/assets/stylesheets/org_member.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the OrgMember controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/org_projects.css.scss b/app/assets/stylesheets/org_projects.css.scss new file mode 100644 index 000000000..12f4fef6a --- /dev/null +++ b/app/assets/stylesheets/org_projects.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the org_projects controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb new file mode 100644 index 000000000..325a5ff85 --- /dev/null +++ b/app/controllers/org_document_comments_controller.rb @@ -0,0 +1,54 @@ +class OrgDocumentCommentsController < ApplicationController + before_filter :find_organization, :only => [:new, :create, :show, :index] + + layout 'base_org' + + def new + @org_document_comment = OrgDocumentComment.new + end + + def create + @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id) + @org_document_comment.title = params[:org_document_comment][:title] + @org_document_comment.content = params[:org_document_comment][:content] + if @org_document_comment.save + #flash[:notice] = 'success' + OrgActivity + redirect_to organization_org_document_comments_path(@organization) + else + redirect_to new_org_document_comment_path(:organization_id => @organization.id) + end + end + def show + + end + + def index + @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc") + end + def update + + end + + def add_reply + @document = OrgDocumentComment.find(params[:id]).root + @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id]) + @comment.content = params[:org_content] + @document.children << @comment + @document.save + end + + def find_organization + @organization = Organization.find(params[:organization_id]) + end + + def destroy + @org_document_comment = OrgDocumentComment.find(params[:id]) + org = @org_document_comment.organization + if @org_document_comment.destroy + if @org_document_comment.id == org.id + org.home_id == nil + end + end + end +end diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb new file mode 100644 index 000000000..18724882c --- /dev/null +++ b/app/controllers/org_member_controller.rb @@ -0,0 +1,53 @@ +class OrgMemberController < ApplicationController + + def org_member_autocomplete + @org = Organization.find(params[:org]) + @flag = params[:flag] || false + respond_to do |format| + format.js + end + end + + def create + @org = Organization.find(params[:org]) + member_ids = params[:membership][:user_ids] + role_id = params[:orgRole] + member_ids.each do |user_id| + member = OrgMember.create(:user_id=>user_id) + @org.org_members << member + OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id) + end + respond_to do |format| + format.js + end + end + + def update + @member = OrgMember.find(params[:id]) + #@member.change_role params[:org_member][:role_ids] + @member_role = @member.org_member_roles[0] + @member_role.role_id = params[:org_member][:role_ids][0] + @member_role.save + @org = @member.organization + respond_to do |format| + format.js + end + end + + def new + + end + + def destroy + member = OrgMember.find(params[:id]) + @org = member.organization + member.destroy + respond_to do |format| + format.js + end + end + + def index + + end +end diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb new file mode 100644 index 000000000..e11005b4a --- /dev/null +++ b/app/controllers/org_projects_controller.rb @@ -0,0 +1,18 @@ +class OrgProjectsController < ApplicationController + def create + org_ids = params[:orgNames] + @project = Project.find(params[:project_id]) + org_ids.each do |org_id| + OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now) + p 1 + end + respond_to do |format| + format.js + end + end + def destroy + @project = Project.find(params[:project_id]) + @org_project = OrgProject.find(params[:id]) + @org_project.destroy + end +end diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index a51093ad9..fbe3814a4 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,6 +1,6 @@ # encoding: utf-8 class OrganizationsController < ApplicationController - # before_filter :find_organization, :except => [:show,:new,:index,:create] + before_filter :find_organization, :only => [:show] layout 'base_org' def index @@ -26,7 +26,8 @@ class OrganizationsController < ApplicationController def show @organization = Organization.find(params[:id]) - @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?)', @organization.id, 'CreateOrganization ') + @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', + @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') @activities = paginateHelper @activities, 10 end @@ -67,4 +68,18 @@ class OrganizationsController < ApplicationController def clear_org_avatar_temp end + + def set_homepage + org = Organization.find(params[:id]) + org.home_id = params[:home_id] + org.save + end + + def autocomplete_search + @project = Project.find(params[:project_id]) + #@flag = params[:flag] || false + respond_to do |format| + format.js + end + end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d26e465ba..a55251d5b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -69,6 +69,24 @@ class ProjectsController < ApplicationController ### added by william include ActsAsTaggableOn::TagsHelper + #查找组织 + def search_public_orgs_not_in_project + condition = '%%' + if !params[:name].nil? + condition = "%#{params[:name].strip}%".gsub(" ","") + end + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) + @org_count = Organization.where("is_public = 1").where("name like ?", condition).count + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition) + end + render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json + end + def index render_404 end @@ -338,6 +356,15 @@ class ProjectsController < ApplicationController @wiki ||= @project.wiki @select_tab = params[:tab] + #找出所有不属于项目的公共组织 + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{@project.id}") + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("is_public = 1") + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1") + end + # 处理从新建版本库返回来的错误信息 if !params[:repository_error_message].to_s.blank? html = "" @@ -826,5 +853,4 @@ class ProjectsController < ApplicationController end #gcmend - end diff --git a/app/helpers/org_document_comment_helper.rb b/app/helpers/org_document_comment_helper.rb new file mode 100644 index 000000000..b430114f2 --- /dev/null +++ b/app/helpers/org_document_comment_helper.rb @@ -0,0 +1,2 @@ +module OrgDocumentCommentHelper +end diff --git a/app/helpers/org_member_helper.rb b/app/helpers/org_member_helper.rb new file mode 100644 index 000000000..08313f4e9 --- /dev/null +++ b/app/helpers/org_member_helper.rb @@ -0,0 +1,16 @@ +module OrgMemberHelper + include ApplicationHelper + def find_user_not_in_current_org_by_name org + if params[:q] && params[:q].lstrip.rstrip != "" + scope = Principal.active.sorted.not_member_of_org(org).like(params[:q]) + else + scope = [] + end + principals = paginateHelper scope,10 + s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') + links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| + link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true + } + s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + end +end diff --git a/app/helpers/org_projects_helper.rb b/app/helpers/org_projects_helper.rb new file mode 100644 index 000000000..f3a7025bd --- /dev/null +++ b/app/helpers/org_projects_helper.rb @@ -0,0 +1,2 @@ +module OrgProjectsHelper +end diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index e10d4026d..33d5dea6e 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -16,4 +16,5 @@ module OrganizationsHelper } s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) end + end diff --git a/app/models/org_activity.rb b/app/models/org_activity.rb new file mode 100644 index 000000000..c48ebdf8e --- /dev/null +++ b/app/models/org_activity.rb @@ -0,0 +1,5 @@ +class OrgActivity < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :org_act ,:polymorphic => true + belongs_to :container,:polymorphic => true +end diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb new file mode 100644 index 000000000..2b3c9132a --- /dev/null +++ b/app/models/org_document_comment.rb @@ -0,0 +1,16 @@ +class OrgDocumentComment < ActiveRecord::Base + attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked + include Redmine::SafeAttributes + belongs_to :organization + belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id' + + acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc" + has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy + after_create :document_save_as_org_activity + + def document_save_as_org_activity + if(self.parent().nil?) + self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization') + end + end +end diff --git a/app/models/org_project.rb b/app/models/org_project.rb new file mode 100644 index 000000000..ec01013fc --- /dev/null +++ b/app/models/org_project.rb @@ -0,0 +1,5 @@ +class OrgProject < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :organization + belongs_to :project +end diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index d84bd5e8c..88acb59f6 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -14,6 +14,7 @@ <%= heads_for_theme %> <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> + <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -30,7 +31,6 @@ <% end %>
    - <% @organization = Organization.find(params[:id])%>
    @@ -50,11 +50,15 @@ <% end %> <% end%>
    -
    组织id:<%= @organization.id %>
    +
    组织id：<%= @organization.id %>
    配置
    -
    文章 ( 3 ) | 成员 ( 10 )
    +
    + <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> +  ) | 成员 ( <%= @organization.org_members.count %>  ) +
    动态
    @@ -77,90 +81,9 @@ <%= call_hook :view_layouts_base_content %>
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    <%= render :partial => 'layouts/footer' %> diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index be178607f..3bf109f37 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -581,10 +581,7 @@ } }); - //查询学校 - $("input[name='province']").on('input', function (e) { - throttle(shcool_search_fn,window,e); - }); + function throttle(method,context,e){ clearTimeout(method.tId); @@ -606,7 +603,10 @@ type: 'post', success: function (data) { schoolsResult = data.schools; - count = data.count; + count = data.count; //查询学校 + $("input[name='province']").on('input', function (e) { + throttle(shcool_search_fn,window,e); + }); maxPage = Math.ceil(count/100) //最大页码值 if(schoolsResult.length != undefined && schoolsResult.length != 0) { var i = 0; diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb new file mode 100644 index 000000000..f47048bf9 --- /dev/null +++ b/app/views/org_document_comments/_new.html.erb @@ -0,0 +1,40 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
    +
    + +
    +
    + +
    +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb new file mode 100644 index 000000000..930c8ebb0 --- /dev/null +++ b/app/views/org_document_comments/add_reply.js.erb @@ -0,0 +1,3 @@ +$("#organization_document_<%= @document.id %>").html(""); +$("#organization_document_<%= @document.id %>").html("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document}) %>"); +init_activity_KindEditor_data(<%= @document.id %>,"","87%"); \ No newline at end of file diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb new file mode 100644 index 000000000..bcebe9d37 --- /dev/null +++ b/app/views/org_document_comments/destroy.js.erb @@ -0,0 +1 @@ +location.reload(); \ No newline at end of file diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb new file mode 100644 index 000000000..8915e020c --- /dev/null +++ b/app/views/org_document_comments/index.html.erb @@ -0,0 +1,26 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %> + +<%= render :partial => 'new' %> +<% unless @documents.nil? %> + <% @documents.each do |document| %> + +
    + <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %> +
    + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb new file mode 100644 index 000000000..11a7e9359 --- /dev/null +++ b/app/views/org_document_comments/new.html.erb @@ -0,0 +1,40 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
    +
    + +
    +
    + +
    +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/org_projects/create.js.erb b/app/views/org_projects/create.js.erb new file mode 100644 index 000000000..cadad16b2 --- /dev/null +++ b/app/views/org_projects/create.js.erb @@ -0,0 +1,4 @@ + +$("#search_orgs_result_list").next().html(""); +$("#added_orgs").html(""); +$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/org_projects/destroy.js.erb b/app/views/org_projects/destroy.js.erb new file mode 100644 index 000000000..ee3c67bbd --- /dev/null +++ b/app/views/org_projects/destroy.js.erb @@ -0,0 +1,2 @@ +$("#added_orgs").html(""); +$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/organization/_form.html.erb b/app/views/organization/_form.html.erb deleted file mode 100644 index 80cc76850..000000000 --- a/app/views/organization/_form.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -<%= error_messages_for 'project' %> - -<% unless @organizations.new_record? %> -

    - <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organizations} %> -

    -<% end %> -

    - - <%= f.text_field :name, :required => true, :size => 60, :style => "width:290px;" %> -

    - - - <%#= l(:field_description)%> - - - - diff --git a/app/views/organization/edit.html.erb b/app/views/organization/edit.html.erb deleted file mode 100644 index 60b7c06a0..000000000 --- a/app/views/organization/edit.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -<%= form_for(@organization) do |f|%> -

    - <%=l(:label_organization_edit)%> -

    -
    - <%= error_messages_for 'project' %> -

    - <%= render :partial=>"avatar/avatar_form",:locals=> {source:@organization} %> -

    -

    - - <%= f.text_field :name, :required => true, :size => 60, :style => "width:290px;" %> -

    - - <%= submit_tag l(:button_create), :class => "enterprise"%> - -
    - <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %> - <%= javascript_tag "$('#project_name').focus();" %> -<% end %> - -<% html_title(l(:label_organization_edit)) -%> \ No newline at end of file diff --git a/app/views/organization/index.html.erb b/app/views/organization/index.html.erb deleted file mode 100644 index f1c50d6ab..000000000 --- a/app/views/organization/index.html.erb +++ /dev/null @@ -1,31 +0,0 @@ - - <%= l(:label_all_enterprises) %> - -
    -
    - <%= l(:label_all_enterprises) %> -
    -
    - <% if @organizations.empty? %> -

    - <%= l(:label_enterprise_nil) %> -

    - <% else %> - <% @organizations.each do |organization| %> - <% unless organization.name.blank? %> -
      -
    • - <%= organization.name%> - <%= link_to organization.name, home_path(:organization => organization.id) %> -
      • -
    - <% end %> - <% end %> - <% end %> -
    -
    -
    -
    -
      -
      -<% html_title(l(:label_enterprise_all)) -%> diff --git a/app/views/organization/new.html.erb b/app/views/organization/new.html.erb deleted file mode 100644 index 163f4a5f5..000000000 --- a/app/views/organization/new.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<%= form_for(@organizations, :method => :post, - :name => 'new_form', - :url => {:controller => 'organization', - :action => 'create'}) do |f|%> -

      - <%=l(:label_organization_new)%> -

      -
      - <%= render :partial => 'form', :locals => { :f => f } %> - - <%= submit_tag l(:button_create), :class => "enterprise"%> - -
      - <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %> - <%= javascript_tag "$('#project_name').focus();" %> -<% end %> - -<% html_title(l(:label_organization_new)) -%> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb new file mode 100644 index 000000000..102867ce0 --- /dev/null +++ b/app/views/organizations/_show_org_document.html.erb @@ -0,0 +1,90 @@ +
      +
      +
      + <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> +
      +
      +
      + <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> + TO<%= link_to document.organization.name, organization_path(document.organization) %> | 组织 +
      +
      <%= document.title %>
      +
      + 发帖时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
      + <% unless document.content.blank? %> +
      + <%= document.content.html_safe %> +
      + <% end %> +
      +
        +
      • +
          +
        • + <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> + 设为首页 + <% end %> +
          • +
        • 编辑文章
          • +
        • + <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %> +
          • +
        +
        • +
      +
      +
      +
      +
      +<% comments_for_doc = document.children.reorder("created_at desc") %> +
      +
      +
      回复（<%= document.children.count() %>）
      + <% if count > 3 %> +
      + + 展开更多 + +
      + <% end %> + + +
      + <% comments_for_doc.each do |comment| %> +
      <%= image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像") %>
      +
      +
      + <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> + <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> +
      + <% unless comment.content.blank? %> +
      <%= comment.content.html_safe %>
      + <% end %> +
      +
      + <% end %> +
      +
      +
      + <%= image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像") %> +
      +
      +
      + <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> + + + +
      + + +
      +

      + <% end %> +
      +
      +
      +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/app/views/organizations/autocomplete_search.js.erb b/app/views/organizations/autocomplete_search.js.erb new file mode 100644 index 000000000..357ef668c --- /dev/null +++ b/app/views/organizations/autocomplete_search.js.erb @@ -0,0 +1,13 @@ +<% if @project%> +var checked = $("#not_org_members input:checked").size(); +if(checked > 0) +{ + alert('翻页或搜索后将丢失当前选择的用户数据!'); +} +<% if @flag == "true"%> +$('#new_orgs_for_project').html('<%= escape_javascript(search_public_orgs_not_in_project(@project.id)) %>'); +<% else%> +$('#new_orgs_for_project').html('<%= escape_javascript(search_public_orgs_not_in_project(@project.id)) %>'); +<% end%> + +<%end%> diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb new file mode 100644 index 000000000..bcebe9d37 --- /dev/null +++ b/app/views/organizations/set_homepage.js.erb @@ -0,0 +1 @@ +location.reload(); \ No newline at end of file diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 61e6b1534..e203b5eed 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -89,7 +89,8 @@ <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
      <%= find_user_not_in_current_org_by_name(@project) %> -
      +
      +
      • 角色
      • diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 2f25ae8a3..2c94ed163 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,5 +1,7 @@ <%= javascript_include_tag "jquery.infinitescroll.js" %> - +<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id)} %> + <% end %>
        最新动态
          @@ -28,6 +30,9 @@
      <% end %> + <% if act.org_act_type == 'OrgDocumentComment' %> + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> + <% end %> <% end %>
        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 3fc9a89d6..76258b9e9 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -12,6 +12,7 @@ project_setting(6); $("#pro_st_edit_ku").toggle(); <%else%> + project_setting(5); <% end%> <% end%> $("div[nhname='pro_setting']").show(); @@ -36,6 +37,7 @@ <% if User.current.allowed_to?(:manage_members, @project) %>
      • 成员
        • <% end %> +
      • 组织
        • <% if User.current.allowed_to?(:manage_versions, @project) %>
      • 版本
        • <% end %> @@ -63,6 +65,7 @@ <%= render :partial=>"projects/settings/new_members" if User.current.allowed_to?(:manage_members, @project)%>
      +
      <%= render :partial=>"projects/settings/new_versions" if User.current.allowed_to?(:manage_versions, @project)%>
      @@ -70,6 +73,9 @@ +
      + <%= render :partial=>"projects/settings/join_org" %> +
      <%= render :partial=>"projects/settings/new_repositories" if User.current.allowed_to?(:manage_repository, @project)%> diff --git a/app/views/projects/settings/_added_orgs.html.erb b/app/views/projects/settings/_added_orgs.html.erb new file mode 100644 index 000000000..06d3ae439 --- /dev/null +++ b/app/views/projects/settings/_added_orgs.html.erb @@ -0,0 +1,9 @@ +
        +
      • 名称操作
        • + <% orgs.each do |org| %> +
      • <%= org.name %> + <%= link_to "取消关联", org_project_path(:id => OrgProject.where(:organization_id => org.id, :project_id => project_id).first.id, :project_id => project_id), + :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %> +
        • + <% end %> +
      \ No newline at end of file diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb new file mode 100644 index 000000000..b7e58ee4c --- /dev/null +++ b/app/views/projects/settings/_join_org.html.erb @@ -0,0 +1,108 @@ + + + + + + + +<%= stylesheet_link_tag 'org' %> + +
        +
      • 组织
        • +
      • +
        +
      +
      +
      + 关联组织 +
      + <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true %> + +
      +
        +
      + 关联 + 取消 +
      +
      +
      + 已关联组织 +
      + <%= render :partial => 'projects/settings/added_orgs', :locals => {:orgs => @project.organizations, :project_id => params[:id]} %> +
      +
      +
      +
      +
      +
      + + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 639056b94..fc7b74cd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,9 +35,19 @@ RedmineApp::Application.routes.draw do member do get 'setting'#, :action => 'settings', :as => 'settings' get 'clear_org_avatar_temp' + put 'set_homepage' end collection do get 'check_uniq' + get 'autocomplete_search' + end + resources :org_document_comments do + member do + + end + collection do + + end end end @@ -50,6 +60,25 @@ RedmineApp::Application.routes.draw do end end + resources :org_document_comments do + member do + post 'add_reply' + end + collection do + + end + end + + resources :org_projects do + member do + + end + collection do + + end + end + #match '/organizations/:organization_id/org_document_comments/new', :to => 'org_document_comments#new', :as => 'new_org_documents', :via => [:get, :post] + #match '/organizations/:organization_id/org_document_comments/create', :to => 'org_document_comments#create', :as => 'create_org_documents', :via => [:post] resources :homework_users resources :no_uses delete 'no_uses', :to => 'no_uses#delete' @@ -493,6 +522,7 @@ RedmineApp::Application.routes.draw do post 'unarchive' post 'close' post 'reopen' + post 'search_public_orgs_not_in_project' match 'copy', :via => [:get, :post] end diff --git a/db/migrate/20151104020233_create_org_document_comments.rb b/db/migrate/20151104020233_create_org_document_comments.rb new file mode 100644 index 000000000..e300785aa --- /dev/null +++ b/db/migrate/20151104020233_create_org_document_comments.rb @@ -0,0 +1,13 @@ +class CreateOrgDocumentComments < ActiveRecord::Migration + def change + create_table :org_document_comments do |t| + t.string :title + t.text :content + t.integer :organization_id + t.integer :creator_id + t.integer :parent_id + t.integer :reply_id + t.timestamps + end + end +end diff --git a/db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb b/db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb new file mode 100644 index 000000000..313800985 --- /dev/null +++ b/db/migrate/20151104024335_add_locked_and_sticky_column_to_entity_org_document_comments.rb @@ -0,0 +1,6 @@ +class AddLockedAndStickyColumnToEntityOrgDocumentComments < ActiveRecord::Migration + def change + add_column :org_document_comments,:locked,:boolean,:default => false + add_column :org_document_comments,:sticky,:integer,:default => 0 + end +end diff --git a/db/migrate/20151104032831_create_org_activity.rb b/db/migrate/20151104032831_create_org_activity.rb new file mode 100644 index 000000000..8d78102b3 --- /dev/null +++ b/db/migrate/20151104032831_create_org_activity.rb @@ -0,0 +1,16 @@ +class CreateOrgActivity < ActiveRecord::Migration + def up + create_table :org_activities do |t| + t.integer :user_id + t.integer :act_id + t.string :act_type + t.integer :container_id + t.string :container_type + + t.timestamps + end + end + + def down + end +end diff --git a/db/migrate/20151104070007_create_org_projects.rb b/db/migrate/20151104070007_create_org_projects.rb new file mode 100644 index 000000000..db83f9632 --- /dev/null +++ b/db/migrate/20151104070007_create_org_projects.rb @@ -0,0 +1,11 @@ +class CreateOrgProjects < ActiveRecord::Migration + def up + create_table :org_projects do |t| + t.integer :organization_id + t.integer :project_id + end + end + + def down + end +end diff --git a/db/migrate/20151104070455_delete_column_role_from_org_members.rb b/db/migrate/20151104070455_delete_column_role_from_org_members.rb new file mode 100644 index 000000000..2e986dd9b --- /dev/null +++ b/db/migrate/20151104070455_delete_column_role_from_org_members.rb @@ -0,0 +1,8 @@ +class DeleteColumnRoleFromOrgMembers < ActiveRecord::Migration + def up + remove_column :org_members, :role + end + + def down + end +end diff --git a/db/migrate/20151104073902_rename_column_for_org_activity.rb b/db/migrate/20151104073902_rename_column_for_org_activity.rb new file mode 100644 index 000000000..e644c16cb --- /dev/null +++ b/db/migrate/20151104073902_rename_column_for_org_activity.rb @@ -0,0 +1,6 @@ +class RenameColumnForOrgActivity < ActiveRecord::Migration + def change + rename_column :org_activities,:act_id,:org_act_id + rename_column :org_activities,:act_type,:org_act_type + end +end diff --git a/db/migrate/20151104090032_create_org_member_roles.rb b/db/migrate/20151104090032_create_org_member_roles.rb new file mode 100644 index 000000000..d97d6eda7 --- /dev/null +++ b/db/migrate/20151104090032_create_org_member_roles.rb @@ -0,0 +1,11 @@ +class CreateOrgMemberRoles < ActiveRecord::Migration + def up + create_table :org_member_roles do |t| + t.integer :org_member_id + t.integer :role_id + end + end + + def down + end +end diff --git a/db/migrate/20151110011003_add_time_to_org_project.rb b/db/migrate/20151110011003_add_time_to_org_project.rb new file mode 100644 index 000000000..dfe370103 --- /dev/null +++ b/db/migrate/20151110011003_add_time_to_org_project.rb @@ -0,0 +1,5 @@ +class AddTimeToOrgProject < ActiveRecord::Migration + def change + add_column :org_projects, :created_at, :timestamp + end +end diff --git a/db/schema.rb b/db/schema.rb index d75b4f7a4..90f58aa3c 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 => 20151104090032) do +ActiveRecord::Schema.define(:version => 20151110011003) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1209,8 +1209,9 @@ ActiveRecord::Schema.define(:version => 20151104090032) do end create_table "org_projects", :force => true do |t| - t.integer "organization_id" - t.integer "project_id" + t.integer "organization_id" + t.integer "project_id" + t.datetime "created_at" end create_table "organizations", :force => true do |t| diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 8d9275f31..3857b53e2 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -30,4 +30,15 @@ a.saveBtn:hover {background-color:#297fb8;} .upbtn { margin: 40px 0px 0px 15px; display: block; padding: 2px 5px; - border: 1px solid #EAEAEA;} \ No newline at end of file + border: 1px solid #EAEAEA;} + +/*项目关联css*/ +.relateOrg {width:335px;} +.relatedList {width:335px;} +.searchOrg {height:24px; width:200px; color:#9b9b9b9; border:1px solid #15bccf;} +a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} +a.cancelBtn:hover {background-color:#717171; color:#ffffff;} +.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} +.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +.relatedListOption {width:80px; text-align:center;} +.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} \ No newline at end of file diff --git a/spec/controllers/org_document_comment_controller_spec.rb b/spec/controllers/org_document_comment_controller_spec.rb new file mode 100644 index 000000000..016416264 --- /dev/null +++ b/spec/controllers/org_document_comment_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgDocumentCommentController, :type => :controller do + +end diff --git a/spec/controllers/org_member_controller_spec.rb b/spec/controllers/org_member_controller_spec.rb new file mode 100644 index 000000000..a116db00f --- /dev/null +++ b/spec/controllers/org_member_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgMemberController, :type => :controller do + +end diff --git a/spec/controllers/org_projects_controller_spec.rb b/spec/controllers/org_projects_controller_spec.rb new file mode 100644 index 000000000..8adc91d66 --- /dev/null +++ b/spec/controllers/org_projects_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgProjectsController, :type => :controller do + +end diff --git a/spec/factories/org_activities.rb b/spec/factories/org_activities.rb new file mode 100644 index 000000000..552ea70f9 --- /dev/null +++ b/spec/factories/org_activities.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :org_activity do + + end + +end diff --git a/spec/factories/org_document_comments.rb b/spec/factories/org_document_comments.rb new file mode 100644 index 000000000..206c471aa --- /dev/null +++ b/spec/factories/org_document_comments.rb @@ -0,0 +1,11 @@ +FactoryGirl.define do + factory :org_document_comment do + title "MyString" +content "MyText" +organization_id 1 +creator_id 1 +parent_id 1 +reply_id 1 + end + +end diff --git a/spec/models/org_activity_spec.rb b/spec/models/org_activity_spec.rb new file mode 100644 index 000000000..e452fe172 --- /dev/null +++ b/spec/models/org_activity_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgActivity, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/org_document_comment_spec.rb b/spec/models/org_document_comment_spec.rb new file mode 100644 index 000000000..ba5dd15a4 --- /dev/null +++ b/spec/models/org_document_comment_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgDocumentComment, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 41751f08bac7c32866f75158c27fdd62f19cf87c Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 11:31:35 +0800 Subject: [PATCH 07/55] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4icon=E5=A2=9E=E5=8A=A0tip?= =?UTF-8?q?=EF=BC=8C=E4=B8=A4=E4=B8=AAicon=E7=9A=84=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index 286d5eb39..1b0202536 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -9,10 +9,10 @@ <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
    • - <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %> + <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del",:title=>"删除") %>
      • -
    • - <%= link_to "",edit_student_work_path(work),:class => "pic_edit"%> +
    • + <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
      • <% end%> <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%> From 8fa790dd6b453255b297b043d3ed046eeeb494f4 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 11:48:27 +0800 Subject: [PATCH 08/55] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_list.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 64f097114..c18ec4c73 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -2,10 +2,14 @@ 作品 - (已有<%= @student_work_count%>人提交) + (<%= @student_work_count%>人已交) <% if !@is_teacher && @stundet_works.empty?%> 您尚未提交作品 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交且不可再修改，因为截止日期已过 + <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%> + 您已提交，您还可以修改 <% end %> <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> From 3f60893591a4316c3d96956c09d45a0f37239dba Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 14:53:12 +0800 Subject: [PATCH 09/55] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=9C=A8=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E5=8F=98=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/homework_publishtime.rake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index 4d79086d4..8e231fafd 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -1,7 +1,7 @@ #coding=utf-8 namespace :homework_publishtime do - desc "start publish homework" + desc "start publish homework and end homework" task :publish => :environment do homework_commons = HomeworkCommon.where("publish_time = '#{Date.today}'") homework_commons.each do |homework| @@ -20,4 +20,16 @@ namespace :homework_publishtime do end end end + + task :end => :environment do + homework_commons = HomeworkCommon.where("end_time < '#{Date.today}'") + homework_commons.each do |homework| + if homework.anonymous_comment == 1 + homework_detail_manual = homework.homework_detail_manual + if homework_detail_manual.comment_status == 1 + homework_detail_manual.update_column('comment_status', 3) + end + end + end + end end \ No newline at end of file From d508cfa381d3c1d8e28a8d021d05188ee87c01a3 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 14:55:31 +0800 Subject: [PATCH 10/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 7 ++ app/controllers/projects_controller.rb | 13 ++-- .../org_document_comments/index.html.erb | 1 + app/views/org_projects/create.js.erb | 4 +- app/views/org_projects/destroy.js.erb | 2 + .../organizations/_show_org_document.html.erb | 68 ++++++++++++------ app/views/organizations/show.html.erb | 24 +++++++ .../search_public_orgs_not_in_project.js.erb | 13 ++++ .../projects/settings/_join_org.html.erb | 71 +++++++++---------- config/routes.rb | 2 +- 10 files changed, 141 insertions(+), 64 deletions(-) create mode 100644 app/views/projects/search_public_orgs_not_in_project.js.erb diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 325a5ff85..d9ed0f1f5 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -27,6 +27,13 @@ class OrgDocumentCommentsController < ApplicationController @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc") end def update + @org_document = OrgDocumentComment.find(params[:id]) + respond_to do |format| + # format.html {redirect_to :} + end + end + + def edit end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a55251d5b..5e6a584c8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -77,14 +77,19 @@ class ProjectsController < ApplicationController end project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) if project_org_ids.empty? - @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) + @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) @org_count = Organization.where("is_public = 1").where("name like ?", condition).count else project_org_ids = "(" + project_org_ids.join(',') + ")" - @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)-1).per(10) - @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition) + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).count + end + # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count + @orgs_page = Paginator.new @org_count, 10,params[:page] + #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json + respond_to do |format| + format.js end - render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json end def index diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index 8915e020c..a7340c08a 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -16,6 +16,7 @@ <% @documents.each do |document| %> diff --git a/app/views/org_projects/create.js.erb b/app/views/org_projects/create.js.erb index cadad16b2..545918c73 100644 --- a/app/views/org_projects/create.js.erb +++ b/app/views/org_projects/create.js.erb @@ -1,4 +1,6 @@ -$("#search_orgs_result_list").next().html(""); +$("#search_orgs_result_list").html(""); +//$("#search_orgs_result_list").append('
        '); $("#added_orgs").html(""); +$("#paginator").css("display", "none"); $("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/org_projects/destroy.js.erb b/app/views/org_projects/destroy.js.erb index ee3c67bbd..45a014b23 100644 --- a/app/views/org_projects/destroy.js.erb +++ b/app/views/org_projects/destroy.js.erb @@ -1,2 +1,4 @@ $("#added_orgs").html(""); +$("#search_orgs_result_list").html(""); +$("#paginator").css("display", "none"); $("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 102867ce0..db27cacc3 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -37,9 +37,10 @@
      <% comments_for_doc = document.children.reorder("created_at desc") %> -
      -
      -
      回复（<%= document.children.count() %>）
      +<% count = document.children.count() %> +
      +
      +
      回复（<%= count %>）
      <% if count > 3 %>
      @@ -47,31 +48,36 @@
      <% end %> - - -
      - <% comments_for_doc.each do |comment| %> -
      <%= image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像") %>
      -
      -
      - <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> - <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> -
      - <% unless comment.content.blank? %> -
      <%= comment.content.html_safe %>
      - <% end %> -
      -
      - <% end %> +
      +
      +
        + <% reply_id = 0 %> + <% comments_for_doc.each do |comment| %> + <% reply_id += 1 %> +
      • +
        <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %>
        +
        +
        + <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> + <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> +
        + <% unless comment.content.blank? %> +
        <%= comment.content.html_safe %>
        + <% end %> +
        +
        +
        • + <% end %> +
      - <%= image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像") %> + <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
      <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - +
      @@ -87,4 +93,22 @@
      -
      \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 2c94ed163..2f3610abc 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,5 +1,23 @@ <%= javascript_include_tag "jquery.infinitescroll.js" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %> + <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id)} %> <% end %>
      @@ -31,6 +49,12 @@
      <% end %> <% if act.org_act_type == 'OrgDocumentComment' %> + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> <% end %> <% end %> diff --git a/app/views/projects/search_public_orgs_not_in_project.js.erb b/app/views/projects/search_public_orgs_not_in_project.js.erb new file mode 100644 index 000000000..69005d304 --- /dev/null +++ b/app/views/projects/search_public_orgs_not_in_project.js.erb @@ -0,0 +1,13 @@ +$("#search_orgs_result_list").html(""); +$("#search_orgs_result_list").append('
        '); + <% @orgs_not_in_project.each do |org|%> + link = "
        • "; + $("#search_orgs_result_list").append(link ); + <%end %> +$("#search_orgs_result_list").append('
      ') +<% if @org_count > 10 %> +$("#paginator").html(' <%= pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>'); +$("#paginator").css("display", "block"); +<% else %> +$("#paginator").css("display", "none"); +<% end %> diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb index b7e58ee4c..57ae714bd 100644 --- a/app/views/projects/settings/_join_org.html.erb +++ b/app/views/projects/settings/_join_org.html.erb @@ -18,9 +18,8 @@
      <%= form_tag url_for(:controller => 'org_projects', :action => 'create', :project_id => @project.id), :id => 'join_orgs_for_project', :remote => true %> -
      -
        -
      +
      +
        关联 取消
        @@ -50,22 +49,22 @@ page = 1; $.ajax({ url: '<%= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?name='+ e.target.value+'&page='+page, - type:'post', - success: function(data){ - orgs = data.orgs; - count = data.count; - maxPage = Math.ceil(count/10); - $("#search_orgs_result_list").next().html(""); - if(orgs.length != undefined && orgs.length != 0){ - var i = 0; - for(; i" + orgs[i].organization.name + "
        "; - console.log(link) - $("#search_orgs_result_list").next().append(link ); - } - - } - } + type:'get' +// success: function(data){ +// orgs = data.orgs; +// count = data.count; +// maxPage = Math.ceil(count/10); +// $("#search_orgs_result_list").next().html(""); +// if(orgs.length != undefined && orgs.length != 0){ +// var i = 0; +// for(; i" + orgs[i].organization.name + "
        "; +// console.log(link) +// $("#search_orgs_result_list").next().append(link ); +// } +// +// } +// } }); } @@ -84,25 +83,25 @@ $(document).ready(function(){ $.ajax({ url: '<%= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?page=1', - type:'post', - success: function(data){ - orgs = data.orgs; - count = data.count; - maxPage = Math.ceil(count/10); - $("#search_orgs_result_list").next().html(""); - if(orgs.length != undefined && orgs.length != 0){ - var i = 0; - for(; i" + orgs[i].organization.name + "
        "; - console.log(link) - $("#search_orgs_result_list").next().append(link ); - } - - } - } + type:'get' +// success: function(data){ +// orgs = data.orgs; +// count = data.count; +// maxPage = Math.ceil(count/10); +// $("#search_orgs_result_list").next().html(""); +// if(orgs.length != undefined && orgs.length != 0){ +// var i = 0; +// for(; i" + orgs[i].organization.name + "
        "; +// console.log(link) +// $("#search_orgs_result_list").next().append(link ); +// } +// +// } +// } }); }); function cancel_join_orgs() { - $("#search_orgs_result_list").next().html(""); + $("#search_orgs_result_list").html(""); } \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index fc7b74cd8..44a65133b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -522,7 +522,7 @@ RedmineApp::Application.routes.draw do post 'unarchive' post 'close' post 'reopen' - post 'search_public_orgs_not_in_project' + get 'search_public_orgs_not_in_project' match 'copy', :via => [:get, :post] end From bf01994e4f47b468072cfd7affa885eb6476d577 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 15:12:23 +0800 Subject: [PATCH 11/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_org_document.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index db27cacc3..e9bd6698b 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -6,7 +6,7 @@
        <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO<%= link_to document.organization.name, organization_path(document.organization) %> | 组织 + TO  <%= link_to document.organization.name, organization_path(document.organization) %> | 组织
        <%= document.title %>
        From b52f4f80c4bbbe088241019b8b4b1974ba3d6a51 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 12 Nov 2015 15:31:47 +0800 Subject: [PATCH 12/55] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 60 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 4aa12f627..b7e1bfa1c 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 => 20151020021234) do +ActiveRecord::Schema.define(:version => 20151102090519) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -144,6 +144,36 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.integer "open_anonymous_evaluation", :default => 1 end + create_table "blog_comments", :force => true do |t| + t.integer "blog_id", :null => false + t.integer "parent_id" + t.string "title", :default => "", :null => false + t.text "content" + t.integer "author_id" + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comment_id" + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "blogs", :force => true do |t| + t.string "name", :default => "", :null => false + t.text "description" + t.integer "position", :default => 1 + t.integer "article_count", :default => 0, :null => false + t.integer "comments_count", :default => 0, :null => false + t.integer "last_comments_id" + t.integer "parent_id" + t.integer "author_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "boards", :force => true do |t| t.integer "project_id", :null => false t.string "name", :default => "", :null => false @@ -413,6 +443,7 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.integer "is_public", :limit => 1, :default => 1 t.integer "inherit_members", :limit => 1, :default => 1 t.integer "open_student", :default => 0 + t.integer "outline", :default => 0 end create_table "custom_fields", :force => true do |t| @@ -621,12 +652,13 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.text "description" t.date "publish_time" t.date "end_time" - t.integer "homework_type", :default => 1 + t.integer "homework_type", :default => 1 t.string "late_penalty" t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "teacher_priority", :default => 1 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "teacher_priority", :default => 1 + t.integer "anonymous_comment", :default => 0 end create_table "homework_detail_manuals", :force => true do |t| @@ -1006,11 +1038,21 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.integer "project_id" end + create_table "org_members", :force => true do |t| + t.integer "user_id" + t.integer "organization_id" + t.string "role" + end + create_table "organizations", :force => true do |t| t.string "name" - t.string "logo_link" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.text "description" + t.integer "creator_id" + t.integer "home_id" + t.string "domain" + t.boolean "is_public" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "phone_app_versions", :force => true do |t| @@ -1155,6 +1197,7 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.string "enterprise_name" t.integer "organization_id" t.integer "project_new_type" + t.integer "gpid" end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1571,6 +1614,7 @@ ActiveRecord::Schema.define(:version => 20151020021234) do t.string "identity_url" t.string "mail_notification", :default => "", :null => false t.string "salt", :limit => 64 + t.integer "gid" end add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" From 506709b4742176806663692ea2096ee36e26e585 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 16:35:13 +0800 Subject: [PATCH 13/55] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=AF=BE=E7=A8=8B=20=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=201.=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=20=202.=E7=BB=99=E5=87=BA=E6=98=8E=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=20=203.=E6=8C=89=E9=92=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/attachments.js | 95 +++++++++++++++++++------------ 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 20e845424..d7b49c8be 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -155,13 +155,13 @@ function addFile(inputEl, file, eagerUpload,btnId) { addFile.nextAttachmentId = 1; function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { - + //上传开始调用函数 function onLoadstart(e) { fileSpan.removeClass('ajax-waiting'); fileSpan.addClass('ajax-loading'); $('input:submit', $(this).parents('form')).attr('disabled', 'disabled'); } - + //更改progressbar的值 function onProgress(e) { if (e.lengthComputable) { this.progressbar('value', e.loaded * 100 / e.total); @@ -177,40 +177,43 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { progressEventHandler: onProgress.bind(progressSpan) }) .done(function(result) { - progressSpan.progressbar('value', 100).remove(); - var containerid = $(inputEl).data('containerid'); - console.log($(inputEl)) - if(containerid == undefined ){ - var count = $('#attachments_fields>span').length; - $('#'+btnId).removeAttr("disabled"); - $('#'+btnId).val('确定') - $('#'+btnId).css('background-color','#269ac9') - $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); - } - else{ - $('#'+btnId).removeAttr("disabled"); - $('#'+btnId).val('确定') - $('#'+btnId).css('background-color','#269ac9') - var count = $('#attachments_fields' + containerid + '>span').length; - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('fileCount')); - } - + progressSpan.progressbar('value', 100).remove(); //上传完成就去掉该文件名后的进度条 fileSpan.find('input.description, a').css('display', 'inline-block'); fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block'); }) .fail(function(result) { - progressSpan.text(result.statusText); - if ($("#network_issue")) { + progressSpan.text("网络错误"); + if ($("#network_issue")) { //在上传处都要给出一个network_issue的div用来显示错误 $("#network_issue").show(); } }).always(function() { ajaxUpload.uploading--; fileSpan.removeClass('ajax-loading'); - var form = fileSpan.parents('form'); - if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) { - $('input:submit', form).removeAttr('disabled'); + var containerid = $(inputEl).data('containerid');//多个上传控件需要的容器id + if(containerid == undefined ){ + var count = 1;//同步上传参数为1，所以不需要去获取正在上传的文件就知道是1 + $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); } - form.dequeue('upload'); + else{ + var count = 1; + $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); + } + var form = fileSpan.parents('form'); + if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) { //所有文件上传完毕,更改状态 + $('input:submit', form).removeAttr('disabled'); + $('#' + btnId).removeAttr("disabled"); + $('#' + btnId).val('确定') + $('#' + btnId).css('background-color', '#269ac9') + if(containerid == undefined ){ + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); + }else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count'+containerid).html("" + count + "" + $(inputEl).data('fileCount')); + } + + } + form.dequeue('upload');//上传完成一个就退出一个 }); //gcm files count and add delete_all link @@ -222,7 +225,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { $('#'+btnId).attr("disabled",true); $('#'+btnId).val('提交中'); $('#'+btnId).css('background-color','#c1c1c1') - $('#upload_file_count').html("" + count + "" + $(inputEl).data('lebelFileUploding')); + $('#upload_file_count').html("1" + $(inputEl).data('lebelFileUploding'));//目前肯定是穿一个文件 if (count >= 1) { var add_attachs = $('.add_attachment'); var delete_all = $('.remove_all'); @@ -239,7 +242,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { $('#'+btnId).attr("disabled",true); $('#'+btnId).val('提交中'); $('#'+btnId).css('background-color','#c1c1c1') - $('#upload_file_count' + containerid).html("" + count + "" + $(inputEl).data('lebelFileUploding')); + $('#upload_file_count' + containerid).html("1" + $(inputEl).data('lebelFileUploding'));//目前肯定是穿一个文件 if (count >= 1) { var add_attachs = $('.add_attachment').filter(function(index) { return $(this).data('containerid') == containerid; @@ -262,17 +265,25 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl,btnId) { //gcm } - + //在插入文件名的后边插入div var progressSpan = $('
        ').insertAfter(fileSpan.find('input.upload_filename')); - progressSpan.progressbar(); - fileSpan.addClass('ajax-waiting'); - - var maxSyncUpload = $(inputEl).data('max-concurrent-uploads'); - + progressSpan.progressbar(); //将div处理成progress bar + fileSpan.addClass('ajax-waiting'); //添加文件正在上传的状态 + var containerid = $(inputEl).data('containerid');//多个上传控件需要的容器id + if(containerid == undefined ){ //选择了多少个文件也要显示，因为有时候文件过大，一时半会传不完，但还是显示文件没有选择 + var count = $('#attachments_fields>span').length; + $('#upload_file_count').html("" + count + "" + '个文件被选择'); + }else{ + var count = $('#attachments_fields' + containerid + '>span').length; + $('#upload_file_count'+containerid).html("" + count + "" + '个文件被选择'); + } + //最大的同步上传参数 + var maxSyncUpload = 1 //$(inputEl).data('max-concurrent-uploads'); + //如果没有指定同步上传参数 或者参数不对，或者需要上传的文件已经小于同步上传的个数，那么直接上传 if (maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload) actualUpload(file, attachmentId, fileSpan, inputEl,btnId); - else - $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl)); + else //否则就进行队列上传 + $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl,btnId)); } ajaxUpload.uploading = 0; @@ -338,6 +349,10 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) { function addInputFiles(inputEl,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFiles(inputEl.files, inputEl,btnId); // $(inputEl).remove(); @@ -365,6 +380,10 @@ function addInputFiles_board(inputEl, id,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFiles_board(inputEl.files, inputEl, id,btnId); // $(inputEl).remove(); @@ -497,6 +516,10 @@ function addInputFilesCourseSource(inputEl) { btnId = arguments[2]; // var clearedFileInput = $(inputEl).clone().val(''); if (inputEl.files) { +// if(inputEl.files.length >= 5){ +// alert('一次选择的文件不能超过5个') +// return; +// } // upload files using ajax uploadAndAttachFilesCourseSource(inputEl.files, inputEl,checkBox,btnId); // $(inputEl).remove(); From ab868d7b65654746ae12ea2d848a8184b7a9eef6 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 16:52:42 +0800 Subject: [PATCH 14/55] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/news_controller.rb | 4 ++-- app/models/news.rb | 2 +- app/views/news/_course_form.html.erb | 4 ++++ app/views/news/_course_news_list.html.erb | 3 +++ app/views/news/_course_show.html.erb | 3 +++ app/views/users/_course_news.html.erb | 6 +++++- db/migrate/20151112072948_add_news_sticky.rb | 9 +++++++++ db/schema.rb | 3 ++- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 1 + 10 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20151112072948_add_news_sticky.rb diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 5d83c1320..be2b44c06 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -74,10 +74,10 @@ class NewsController < ApplicationController @q = params[:subject] if params[:subject].nil? || params[:subject].blank? scope_order = scope.all(:include => [:author, :course], - :order => "#{News.table_name}.created_on DESC") + :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC") else scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course], - :order => "#{News.table_name}.created_on DESC") + :order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC") end # :offset => @offset, diff --git a/app/models/news.rb b/app/models/news.rb index a9e9d1d18..e9b8b5314 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -66,7 +66,7 @@ class News < ActiveRecord::Base scope :course_visible, lambda {|*args| includes(:course).where(Course.allowed_to_condition(args.shift || User.current, :view_course_news, *args)) } - safe_attributes 'title', 'summary', 'description' + safe_attributes 'title', 'summary', 'description', 'sticky' def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_news, project) diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index 0a5488714..a51b85870 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -4,6 +4,10 @@

        +
      • + <%= f.check_box :sticky, :value => is_new ? 0 : @news.sticky %> + <%= label_tag 'news_sticky', l(:label_board_sticky) %> +
      • <% if is_new %> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> diff --git a/app/views/news/_course_news_list.html.erb b/app/views/news/_course_news_list.html.erb index 74a70e33d..3db222f25 100644 --- a/app/views/news/_course_news_list.html.erb +++ b/app/views/news/_course_news_list.html.erb @@ -13,6 +13,9 @@ <%= l(:label_release_news) %>： <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %> + <% if news.sticky == 1%> + 置顶 + <% end%> <%=link_to "#{news.comments.all.count}".html_safe, news_path(news.id), :class => "pro_mes_w" %>
        diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 2d8dae59d..34e6e943f 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -8,6 +8,9 @@

        <%=h @news.title %>

        + <% if @news.sticky == 1%> + 置顶 + <% end%> <%= link_to(l(:button_edit), edit_news_path(@news), :class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index f9087f057..475a982e5 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -12,9 +12,13 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
        • -
        + + <% if activity.sticky == 1%> + 置顶 + <% end%> +
        发布时间：<%= format_time(activity.created_on) %>
        diff --git a/db/migrate/20151112072948_add_news_sticky.rb b/db/migrate/20151112072948_add_news_sticky.rb new file mode 100644 index 000000000..85001debe --- /dev/null +++ b/db/migrate/20151112072948_add_news_sticky.rb @@ -0,0 +1,9 @@ +class AddNewsSticky < ActiveRecord::Migration + def up + add_column :news, :sticky, :integer, :default => 0 + end + + def down + remove_column :news, :sticky + end +end diff --git a/db/schema.rb b/db/schema.rb index 7898b3f4d..419b30c3e 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 => 20151109080256) do +ActiveRecord::Schema.define(:version => 20151112072948) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -953,6 +953,7 @@ ActiveRecord::Schema.define(:version => 20151109080256) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 0cb6e203f..05bba54f6 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -555,7 +555,6 @@ a:hover.st_add{ color:#ff8e15;} a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} -.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} .respond-form{display: none;margin: auto;clear: both;} @@ -987,6 +986,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .m_w505{max-width: 505px;} .m_w500{max-width: 500px;} .m_w530{max-width: 530px;} +.m_w600{max-width: 600px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ea45fdbd0..490de9e08 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1082,6 +1082,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w530{max-width: 530px;} +.m_w600{max-width: 600px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; } From 7751dc9081113b382d4d5fc6aa27f9873a9d3d04 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 12 Nov 2015 17:00:35 +0800 Subject: [PATCH 15/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 186 +++++------ app/views/org_document_comments/_new.html.erb | 79 ++--- .../organizations/_show_org_document.html.erb | 226 ++++++------- db/schema.rb | 310 ------------------ 4 files changed, 246 insertions(+), 555 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 88acb59f6..ef65bf8b2 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -1,93 +1,93 @@ -<% @nav_dispaly_project_label = 1 - @nav_dispaly_forum_label = 1 %> -<%#@nav_dispaly_project_label = 1 %> - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> - <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> - - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> - - - - - -
        - <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header' %> - <% else %> - <%= render :partial => 'layouts/unlogin_header' %> - <% end %> -
        -
        -
        -
        -
        -
        - - - - -
        组织id：<%= @organization.id %>
        - 配置 - -
        -
        - <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  - <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> -  ) | 成员 ( <%= @organization.org_members.count %>  ) -
        -
        -
        -
        动态
        -
        项目
        -
        - -
        -
        -
        -
        - <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
        -
        -
        -
        - - -
        - <%= render :partial => 'layouts/footer' %> -
        - - - +<% @nav_dispaly_project_label = 1 + @nav_dispaly_forum_label = 1 %> +<%#@nav_dispaly_project_label = 1 %> + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> + + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + + + + +
        + <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else %> + <%= render :partial => 'layouts/unlogin_header' %> + <% end %> +
        +
        +
        +
        +
        +
        + + + + +
        组织id：<%= @organization.id %>
        + 配置 + +
        +
        + <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> +  ) | 成员 ( <%= @organization.org_members.count %>  ) +
        +
        +
        +
        动态
        +
        项目
        +
        + +
        +
        +
        +
        + <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
        +
        +
        +
        + + +
        + <%= render :partial => 'layouts/footer' %> +
        + + + diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index f47048bf9..91bcad2a9 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -1,40 +1,41 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> - -<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> -
        -
        - -
        -
        - -
        +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
        +
        + +
        +
        +
        + +
        <% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index e9bd6698b..a9802bf66 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -1,114 +1,114 @@ -
        -
        -
        - <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> -
        -
        -
        - <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization) %> | 组织 -
        -
        <%= document.title %>
        -
        - 发帖时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        - <% unless document.content.blank? %> -
        - <%= document.content.html_safe %> -
        - <% end %> -
        -
          -
        • -
            -
          • - <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> - 设为首页 - <% end %> -
            • -
          • 编辑文章
            • -
          • - <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %> -
            • -
          -
          • -
        -
        -
        -
        -
        -<% comments_for_doc = document.children.reorder("created_at desc") %> -<% count = document.children.count() %> -
        -
        -
        回复（<%= count %>）
        - <% if count > 3 %> -
        - - 展开更多 - -
        - <% end %> -
        -
        -
          - <% reply_id = 0 %> - <% comments_for_doc.each do |comment| %> - <% reply_id += 1 %> -
        • -
          <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %>
          -
          -
          - <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %> - <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> -
          - <% unless comment.content.blank? %> -
          <%= comment.content.html_safe %>
          - <% end %> -
          -
          -
          • - <% end %> -
        -
        -
        -
        - <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %> -
        -
        -
        - <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - - - -
        - - -
        -

        - <% end %> -
        -
        -
        -
        -
        -
        -
        - - \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 6aaa08ec4..7c2722e75 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -<<<<<<< HEAD -ActiveRecord::Schema.define(:version => 20151102090519) do -======= ActiveRecord::Schema.define(:version => 20151110011003) do ->>>>>>> bf01994e4f47b468072cfd7affa885eb6476d577 create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -297,16 +293,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.boolean "diff_all" end - create_table "columns_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Column_name", :limit => 64, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -505,33 +491,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - create_table "db", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - - add_index "db", ["User"], :name => "User" - create_table "delayed_jobs", :force => true do |t| t.integer "priority", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false @@ -613,31 +572,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "event", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.datetime "execute_at" - t.integer "interval_value" - t.string "interval_field", :limit => 18 - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.datetime "last_executed" - t.datetime "starts" - t.datetime "ends" - t.string "status", :limit => 18, :default => "ENABLED", :null => false - t.string "on_completion", :limit => 8, :default => "DROP", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.string "comment", :limit => 64, :default => "", :null => false - t.integer "originator", :null => false - t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -689,21 +623,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "locked" end - create_table "func", :primary_key => "name", :force => true do |t| - t.boolean "ret", :default => false, :null => false - t.string "dl", :limit => 128, :default => "", :null => false - t.string "type", :limit => 9, :null => false - end - - create_table "general_log", :id => false, :force => true do |t| - t.timestamp "event_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.integer "thread_id", :null => false - t.integer "server_id", :null => false - t.string "command_type", :limit => 64, :null => false - t.text "argument", :limit => 16777215, :null => false - end - create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -711,35 +630,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - create_table "help_category", :primary_key => "help_category_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "parent_category_id", :limit => 2 - t.text "url", :null => false - end - - add_index "help_category", ["name"], :name => "name", :unique => true - - create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - end - - add_index "help_keyword", ["name"], :name => "name", :unique => true - - create_table "help_relation", :id => false, :force => true do |t| - t.integer "help_topic_id", :null => false - t.integer "help_keyword_id", :null => false - end - - create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "help_category_id", :limit => 2, :null => false - t.text "description", :null => false - t.text "example", :null => false - t.text "url", :null => false - end - - add_index "help_topic", ["name"], :name => "name", :unique => true - create_table "homework_attaches", :force => true do |t| t.integer "bid_id" t.integer "user_id" @@ -825,29 +715,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "host", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1077,15 +944,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" - create_table "ndb_binlog_index", :primary_key => "epoch", :force => true do |t| - t.integer "Position", :limit => 8, :null => false - t.string "File", :null => false - t.integer "inserts", :limit => 8, :null => false - t.integer "updates", :limit => 8, :null => false - t.integer "deletes", :limit => 8, :null => false - t.integer "schemaops", :limit => 8, :null => false - end - create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1180,12 +1038,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "project_id" end -<<<<<<< HEAD - create_table "org_members", :force => true do |t| - t.integer "user_id" - t.integer "organization_id" - t.string "role" -======= create_table "org_activities", :force => true do |t| t.integer "user_id" t.integer "org_act_id" @@ -1223,7 +1075,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "organization_id" t.integer "project_id" t.datetime "created_at" ->>>>>>> bf01994e4f47b468072cfd7affa885eb6476d577 end create_table "organizations", :force => true do |t| @@ -1244,10 +1095,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "plugin", :primary_key => "name", :force => true do |t| - t.string "dl", :limit => 128, :default => "", :null => false - end - create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -1323,42 +1170,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "proc", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.string "type", :limit => 9, :null => false - t.string "specific_name", :limit => 64, :default => "", :null => false - t.string "language", :limit => 3, :default => "SQL", :null => false - t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false - t.string "is_deterministic", :limit => 3, :default => "NO", :null => false - t.string "security_type", :limit => 7, :default => "DEFINER", :null => false - t.binary "param_list", :null => false - t.binary "returns", :limit => 2147483647, :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.text "comment", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - - create_table "procs_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Routine_name", :limit => 64, :default => "", :null => false - t.string "Routine_type", :limit => 9, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.string "Proc_priv", :limit => 0, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "procs_priv", ["Grantor"], :name => "Grantor" - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1433,18 +1244,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "proxies_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Proxied_host", :limit => 60, :default => "", :null => false - t.string "Proxied_user", :limit => 16, :default => "", :null => false - t.boolean "With_grant", :default => false, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "proxies_priv", ["Grantor"], :name => "Grantor" - create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1558,17 +1357,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "is_teacher_score", :default => 0 end - create_table "servers", :primary_key => "Server_name", :force => true do |t| - t.string "Host", :limit => 64, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Username", :limit => 64, :default => "", :null => false - t.string "Password", :limit => 64, :default => "", :null => false - t.integer "Port", :default => 0, :null => false - t.string "Socket", :limit => 64, :default => "", :null => false - t.string "Wrapper", :limit => 64, :default => "", :null => false - t.string "Owner", :limit => 64, :default => "", :null => false - end - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1589,20 +1377,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "description" end - create_table "slow_log", :id => false, :force => true do |t| - t.timestamp "start_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.time "query_time", :null => false - t.time "lock_time", :null => false - t.integer "rows_sent", :null => false - t.integer "rows_examined", :null => false - t.string "db", :limit => 512, :null => false - t.integer "last_insert_id", :null => false - t.integer "insert_id", :null => false - t.integer "server_id", :null => false - t.text "sql_text", :limit => 16777215, :null => false - end - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -1684,19 +1458,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "subject" end - create_table "tables_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Table_priv", :limit => 0, :default => "", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - - add_index "tables_priv", ["Grantor"], :name => "Grantor" - create_table "taggings", :force => true do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1746,32 +1507,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t| - t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false - end - - create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t| - t.integer "Correction", :null => false - end - - create_table "time_zone_name", :primary_key => "Name", :force => true do |t| - t.integer "Time_zone_id", :null => false - end - - create_table "time_zone_transition", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_time", :limit => 8, :null => false - t.integer "Transition_type_id", :null => false - end - - create_table "time_zone_transition_type", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_type_id", :null => false - t.integer "Offset", :default => 0, :null => false - t.integer "Is_DST", :limit => 1, :default => 0, :null => false - t.string "Abbreviation", :limit => 8, :default => "", :null => false - end - create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -1790,51 +1525,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "fields_bits", :default => 0 end - create_table "user", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Password", :limit => 41, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Reload_priv", :limit => 1, :default => "N", :null => false - t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false - t.string "Process_priv", :limit => 1, :default => "N", :null => false - t.string "File_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Show_db_priv", :limit => 1, :default => "N", :null => false - t.string "Super_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Create_user_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false - t.string "ssl_type", :limit => 9, :default => "", :null => false - t.binary "ssl_cipher", :null => false - t.binary "x509_issuer", :null => false - t.binary "x509_subject", :null => false - t.integer "max_questions", :default => 0, :null => false - t.integer "max_updates", :default => 0, :null => false - t.integer "max_connections", :default => 0, :null => false - t.integer "max_user_connections", :default => 0, :null => false - t.string "plugin", :limit => 64, :default => "" - t.text "authentication_string" - end - create_table "user_activities", :force => true do |t| t.string "act_type" t.integer "act_id" From 21275e8b7bd25ab33793a3c990b4cd61b9a8226b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 17:52:47 +0800 Subject: [PATCH 16/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=BC=BA=E9=99=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 6 ++- app/controllers/organizations_controller.rb | 19 ++++++-- app/models/principal.rb | 16 +++---- app/models/user.rb | 15 ++++++ app/views/org_document_comments/edit.html.erb | 43 ++++++++++++++++++ .../organizations/_show_org_document.html.erb | 4 +- app/views/organizations/setting.html.erb | 18 ++++---- public/images/org_default.jpg | Bin 0 -> 1897 bytes 8 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 app/views/org_document_comments/edit.html.erb create mode 100644 public/images/org_default.jpg diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index d9ed0f1f5..60522dc3f 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -28,13 +28,15 @@ class OrgDocumentCommentsController < ApplicationController end def update @org_document = OrgDocumentComment.find(params[:id]) + @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content]) respond_to do |format| - # format.html {redirect_to :} + format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)} end end def edit - + @org_document = OrgDocumentComment.find(params[:id]) + @organization = Organization.find(params[:organization_id]) end def add_reply diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index fbe3814a4..25d0783fb 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -25,10 +25,14 @@ class OrganizationsController < ApplicationController end def show - @organization = Organization.find(params[:id]) - @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', - @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') - @activities = paginateHelper @activities, 10 + if User.current.admin? || User.current.member_of_org?(@organization) + @organization = Organization.find(params[:id]) + @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', + @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') + @activities = paginateHelper @activities, 10 + else + render_403 + end end def update @@ -61,7 +65,12 @@ class OrganizationsController < ApplicationController end def setting - @organization = Organization.find(params[:id]) + @organization = Organization.find(params[:id]) + + if User.current.admin? || User.current.admin_of_org?(@organization) + else + render_403 + end end diff --git a/app/models/principal.rb b/app/models/principal.rb index fc9c7cac4..dd376f609 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -88,14 +88,14 @@ class Principal < ActiveRecord::Base } scope :not_member_of_org, lambda {|org| - orgs = [org] unless org.is_a?(Array) - if orgs.empty? - where("1=0") - else - ids = orgs.map(&:id) - where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{OrgMember.table_name} WHERE organization_id IN (?))", ids) - end - } + orgs = [org] unless org.is_a?(Array) + if orgs.empty? + where("1=0") + else + ids = orgs.map(&:id) + where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{OrgMember.table_name} WHERE organization_id IN (?))", ids) + end + } scope :sorted, lambda { order(*Principal.fields_for_order_statement)} diff --git a/app/models/user.rb b/app/models/user.rb index 4c6449863..740523707 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -770,6 +770,21 @@ class User < Principal courses.to_a.include?(course) end + def member_of_org?(org) + OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count > 0 + end + + def admin_of_org?(org) + if OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count == 0 + return false + end + role = OrgMember.where("user_id =? and organization_id =?", self.id, org.id)[0].roles[0] + unless role.nil? + role.name == 'orgManager' ? true : false + else + false + end + end def member_of_course_group?(course_group) course_groups.to_a.include?(course_group) end diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb new file mode 100644 index 000000000..ffa05ff61 --- /dev/null +++ b/app/views/org_document_comments/edit.html.erb @@ -0,0 +1,43 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +
        +
        编辑文章
        +
        +<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %> +
        +
        + +
        +
        +
        +
        + <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %> +
        +
        + + +

        +
        + +
        + 确定 + 或 + 取消 +
        +
        + +
        +
        +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index e9bd6698b..6641ae23d 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -25,7 +25,9 @@ 设为首页 <% end %> -
      • 编辑文章
        • +
      • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> +
      • <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %>
        • diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index e203b5eed..78cd21504 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -38,7 +38,7 @@
        - + <%#= form_for( @organization,{:controller => 'organizations',:action => 'update',:id=>@organization,:html=>{:id=>'update_org_form',:method=>'put'}}) do %> <%= labelled_form_for @organization do |f|%> @@ -55,14 +55,14 @@
        -
        组织URL： -
        https：// - - .trustie.net申请 -

        - -
        -
        + + + + + + + +
        公开 : class="ml3" />
        diff --git a/public/images/org_default.jpg b/public/images/org_default.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ad1b4f007d0c6141a10715ce46f447630e3ce376 GIT binary patch literal 1897 zcmbVMdr%W+5WmYoMM0Bb02^w&UPJ^Xm&=PJ8X+Wsq6GvLL9G~)10p6DFNY-9VzFw` zYN=8jTkErfD5%6LP{vk}D)_)^3yRP2i8ETo(V|wdq?ZUjW*q8M%0Kjz(B62CpszgzXO`tatS-8MJ zm{GgliedsG3QUZ$TlI!KoPx9P9Fs+b+&|EWz$T*#nITOOCRjCiuIZyf5>G8moMtG@ zGboHm)FgPKU1>L4%{Zlp?dJIwo6@dAJm5-t?N*}*>@lJ8REXNm3a2Mbg*60;!%~4b z!XU&jSSAx-5~)mvjfX`-OoR&QR~CUulv0^e6bbhWLbH*^Y-Nfzwx5gsQz89H6%-T* z3d90}%t0}QLgB^`i6Ur=2%Ez~>Fp5~8-D;ni`xvO$x4|B3+zVJXA$|73ZWx?k%HNp zknj@tt<^G{-FbPeZBz>WDvY;U+on0JIGTdnhGpR#=lNgU8M=S&T%1EzEs9FS6C*q-h~;j3o&(?5VHP^cH@NRES9> zLa|QxB5%1gMjIm$V;ZqGRv{EikbYm||EU>D2ZOqs>r9%I)9zz+gxVu%ey0ln!Z zpO=)dGiz&hfep<$&O7nXmnQFvZC+RLTk)0CrALpCd%%n!degg(6frLE?P)^~f7-lp z_JXTLWFt{iUz5vSzy{eYw)+$AP|n+z(vt7JCO-9!pZ$1sO=6u6+^Ei)P^NmAxT1nU z28F;m9qS+Lsi~OZKP+evZ)tRGzpsD9>Xo%svJ2K9>l-FDs~4BIZ~gB5r^+Wo#GMyK zBWGq79y(C_MY;4sP>a{n^U8@W2kT^3kAk$HrLBpj-8q&$hNK zKAAMPXj?*DdHb);;{vkpjxf~J&7ECRGWf{WlZnIchuiz)wQn9e+i|}k z&Z8#oLcfssGt%O^RN&ljyIgs1+ry3E-Y&=8!wwp+8Z;}=IIFXOM}J&)Q- zuNJ1QYnTED2B+Qx9**Xa86B+Z&2u)Yw*PSb)K^f~ja5Bet8)G>W`5n(x4d!UL+MV% OokfMWGD?bF=l=tIZIm|v literal 0 HcmV?d00001 From 2c5cd1a4b33a39c8884b05d7ef5f3dd0d22c6e15 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 Nov 2015 18:14:56 +0800 Subject: [PATCH 17/55] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=92=8C=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9Flabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 6d929ac5f..0baf31ab2 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -17,11 +17,13 @@
        <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%> +
        <%= calendar_for('homework_end_time')%>
        -
        + +
        <%= calendar_for('homework_publish_time')%>
        From 368d755499e5cb34cd8ad5c150c14e09a6e933fd Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 18:41:10 +0800 Subject: [PATCH 18/55] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 23a31fab3..3a27965c0 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -13,7 +13,7 @@ <% if User.current.language == "zh" %> <% if role.id == 11 %> - + <% elsif role.id == 12 %> <% end %> From 6fd76eb62282eebde06546379dce68d76714842c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:02:00 +0800 Subject: [PATCH 19/55] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=90=E5=91=98?= =?UTF-8?q?=E8=A6=81=E5=81=9A=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 3a27965c0..fdaf9ff8d 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -37,7 +37,8 @@
      • <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> - 编辑 | <%= link_to '删除', org_member_path(member.id),:method=>'delete', :remote => true %><% end %> + 编辑 | + <%= link_to '删除', org_member_path(member.id),:method=>'delete',:confirm=>'您确定要删除么?', :remote => true %><% end %>
        • From b24fadea05ce2082e29963c19be8381e3ddc61ca Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:15:35 +0800 Subject: [PATCH 20/55] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- .../organizations/_org_member_list.html.erb | 8 +- app/views/organizations/setting.html.erb | 1 - db/schema.rb | 357 ++---------------- public/stylesheets/org.css | 4 +- 5 files changed, 40 insertions(+), 332 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dbf246141..ec2f52779 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,7 +52,7 @@ module ApplicationHelper def get_org_member_role_name member case member.roles[0].name when 'orgManager' - '组织管理员' + '管理人员' when 'orgMember' '组织成员' end diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index fdaf9ff8d..46403094f 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -1,7 +1,7 @@ <% members.each do |member|%>
        <% end %> -
      • <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> - 编辑 | - <%= link_to '删除', org_member_path(member.id),:method=>'delete',:confirm=>'您确定要删除么?', :remote => true %><% end %> -
        • + 编辑 + <%= link_to '删除', org_member_path(member.id),:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
        <% end %> \ No newline at end of file diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 78cd21504..82b28fb8a 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -74,7 +74,6 @@
        • 用户
        • 角色
          • -
        diff --git a/db/schema.rb b/db/schema.rb index 90f58aa3c..1f48eaf02 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -293,16 +293,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.boolean "diff_all" end - create_table "columns_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Column_name", :limit => 64, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -501,33 +491,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" - create_table "db", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - - add_index "db", ["User"], :name => "User" - create_table "delayed_jobs", :force => true do |t| t.integer "priority", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false @@ -565,26 +528,23 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - 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 "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 + create_table "dts", :force => true do |t| + t.string "IPLineCode" t.string "Description" - t.text "PreConditions", :limit => 2147483647 - t.text "TraceInfo", :limit => 2147483647 - t.text "Code", :limit => 2147483647 + t.string "Num" + t.string "Variable" + t.string "TraceInfo" + t.string "Method" + t.string "File" + t.string "IPLine" + t.string "Review" + t.string "Category" + t.string "Defect" + t.string "PreConditions" + t.string "StartLine" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "enabled_modules", :force => true do |t| @@ -609,31 +569,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "event", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.datetime "execute_at" - t.integer "interval_value" - t.string "interval_field", :limit => 18 - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.datetime "last_executed" - t.datetime "starts" - t.datetime "ends" - t.string "status", :limit => 18, :default => "ENABLED", :null => false - t.string "on_completion", :limit => 8, :default => "DROP", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.string "comment", :limit => 64, :default => "", :null => false - t.integer "originator", :null => false - t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -685,21 +620,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "locked" end - create_table "func", :primary_key => "name", :force => true do |t| - t.boolean "ret", :default => false, :null => false - t.string "dl", :limit => 128, :default => "", :null => false - t.string "type", :limit => 9, :null => false - end - - create_table "general_log", :id => false, :force => true do |t| - t.timestamp "event_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.integer "thread_id", :null => false - t.integer "server_id", :null => false - t.string "command_type", :limit => 64, :null => false - t.text "argument", :limit => 16777215, :null => false - end - create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -707,35 +627,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true - create_table "help_category", :primary_key => "help_category_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "parent_category_id", :limit => 2 - t.text "url", :null => false - end - - add_index "help_category", ["name"], :name => "name", :unique => true - - create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - end - - add_index "help_keyword", ["name"], :name => "name", :unique => true - - create_table "help_relation", :id => false, :force => true do |t| - t.integer "help_topic_id", :null => false - t.integer "help_keyword_id", :null => false - end - - create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t| - t.string "name", :limit => 64, :null => false - t.integer "help_category_id", :limit => 2, :null => false - t.text "description", :null => false - t.text "example", :null => false - t.text "url", :null => false - end - - add_index "help_topic", ["name"], :name => "name", :unique => true - create_table "homework_attaches", :force => true do |t| t.integer "bid_id" t.integer "user_id" @@ -758,12 +649,13 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.text "description" t.date "publish_time" t.date "end_time" - t.integer "homework_type", :default => 1 + t.integer "homework_type", :default => 1 t.string "late_penalty" t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "teacher_priority", :default => 1 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "teacher_priority", :default => 1 + t.integer "anonymous_comment", :default => 0 end create_table "homework_detail_manuals", :force => true do |t| @@ -820,29 +712,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "host", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -945,6 +814,16 @@ ActiveRecord::Schema.define(:version => 20151110011003) 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" @@ -1072,15 +951,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" - create_table "ndb_binlog_index", :primary_key => "epoch", :force => true do |t| - t.integer "Position", :limit => 8, :null => false - t.string "File", :null => false - t.integer "inserts", :limit => 8, :null => false - t.integer "updates", :limit => 8, :null => false - t.integer "deletes", :limit => 8, :null => false - t.integer "schemaops", :limit => 8, :null => false - end - create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1204,8 +1074,10 @@ ActiveRecord::Schema.define(:version => 20151110011003) do end create_table "org_members", :force => true do |t| - t.integer "user_id" - t.integer "organization_id" + t.integer "user_id" + t.integer "organization_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "org_projects", :force => true do |t| @@ -1232,10 +1104,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "plugin", :primary_key => "name", :force => true do |t| - t.string "dl", :limit => 128, :default => "", :null => false - end - create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -1311,42 +1179,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "updated_at", :null => false end - create_table "proc", :id => false, :force => true do |t| - t.string "db", :limit => 64, :default => "", :null => false - t.string "name", :limit => 64, :default => "", :null => false - t.string "type", :limit => 9, :null => false - t.string "specific_name", :limit => 64, :default => "", :null => false - t.string "language", :limit => 3, :default => "SQL", :null => false - t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false - t.string "is_deterministic", :limit => 3, :default => "NO", :null => false - t.string "security_type", :limit => 7, :default => "DEFINER", :null => false - t.binary "param_list", :null => false - t.binary "returns", :limit => 2147483647, :null => false - t.binary "body", :limit => 2147483647, :null => false - t.string "definer", :limit => 77, :default => "", :null => false - t.timestamp "created", :null => false - t.timestamp "modified", :null => false - t.string "sql_mode", :limit => 0, :default => "", :null => false - t.text "comment", :null => false - t.string "character_set_client", :limit => 32 - t.string "collation_connection", :limit => 32 - t.string "db_collation", :limit => 32 - t.binary "body_utf8", :limit => 2147483647 - end - - create_table "procs_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Routine_name", :limit => 64, :default => "", :null => false - t.string "Routine_type", :limit => 9, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.string "Proc_priv", :limit => 0, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "procs_priv", ["Grantor"], :name => "Grantor" - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1421,18 +1253,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "proxies_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Proxied_host", :limit => 60, :default => "", :null => false - t.string "Proxied_user", :limit => 16, :default => "", :null => false - t.boolean "With_grant", :default => false, :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - end - - add_index "proxies_priv", ["Grantor"], :name => "Grantor" - create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1546,17 +1366,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "is_teacher_score", :default => 0 end - create_table "servers", :primary_key => "Server_name", :force => true do |t| - t.string "Host", :limit => 64, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "Username", :limit => 64, :default => "", :null => false - t.string "Password", :limit => 64, :default => "", :null => false - t.integer "Port", :default => 0, :null => false - t.string "Socket", :limit => 64, :default => "", :null => false - t.string "Wrapper", :limit => 64, :default => "", :null => false - t.string "Owner", :limit => 64, :default => "", :null => false - end - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1577,20 +1386,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "description" end - create_table "slow_log", :id => false, :force => true do |t| - t.timestamp "start_time", :null => false - t.text "user_host", :limit => 16777215, :null => false - t.time "query_time", :null => false - t.time "lock_time", :null => false - t.integer "rows_sent", :null => false - t.integer "rows_examined", :null => false - t.string "db", :limit => 512, :null => false - t.integer "last_insert_id", :null => false - t.integer "insert_id", :null => false - t.integer "server_id", :null => false - t.text "sql_text", :limit => 16777215, :null => false - end - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -1672,19 +1467,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.string "subject" end - create_table "tables_priv", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "Db", :limit => 64, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Table_name", :limit => 64, :default => "", :null => false - t.string "Grantor", :limit => 77, :default => "", :null => false - t.timestamp "Timestamp", :null => false - t.string "Table_priv", :limit => 0, :default => "", :null => false - t.string "Column_priv", :limit => 0, :default => "", :null => false - end - - add_index "tables_priv", ["Grantor"], :name => "Grantor" - create_table "taggings", :force => true do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1734,32 +1516,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t| - t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false - end - - create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t| - t.integer "Correction", :null => false - end - - create_table "time_zone_name", :primary_key => "Name", :force => true do |t| - t.integer "Time_zone_id", :null => false - end - - create_table "time_zone_transition", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_time", :limit => 8, :null => false - t.integer "Transition_type_id", :null => false - end - - create_table "time_zone_transition_type", :id => false, :force => true do |t| - t.integer "Time_zone_id", :null => false - t.integer "Transition_type_id", :null => false - t.integer "Offset", :default => 0, :null => false - t.integer "Is_DST", :limit => 1, :default => 0, :null => false - t.string "Abbreviation", :limit => 8, :default => "", :null => false - end - create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -1778,51 +1534,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.integer "fields_bits", :default => 0 end - create_table "user", :id => false, :force => true do |t| - t.string "Host", :limit => 60, :default => "", :null => false - t.string "User", :limit => 16, :default => "", :null => false - t.string "Password", :limit => 41, :default => "", :null => false - t.string "Select_priv", :limit => 1, :default => "N", :null => false - t.string "Insert_priv", :limit => 1, :default => "N", :null => false - t.string "Update_priv", :limit => 1, :default => "N", :null => false - t.string "Delete_priv", :limit => 1, :default => "N", :null => false - t.string "Create_priv", :limit => 1, :default => "N", :null => false - t.string "Drop_priv", :limit => 1, :default => "N", :null => false - t.string "Reload_priv", :limit => 1, :default => "N", :null => false - t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false - t.string "Process_priv", :limit => 1, :default => "N", :null => false - t.string "File_priv", :limit => 1, :default => "N", :null => false - t.string "Grant_priv", :limit => 1, :default => "N", :null => false - t.string "References_priv", :limit => 1, :default => "N", :null => false - t.string "Index_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_priv", :limit => 1, :default => "N", :null => false - t.string "Show_db_priv", :limit => 1, :default => "N", :null => false - t.string "Super_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false - t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false - t.string "Execute_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false - t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false - t.string "Create_view_priv", :limit => 1, :default => "N", :null => false - t.string "Show_view_priv", :limit => 1, :default => "N", :null => false - t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false - t.string "Create_user_priv", :limit => 1, :default => "N", :null => false - t.string "Event_priv", :limit => 1, :default => "N", :null => false - t.string "Trigger_priv", :limit => 1, :default => "N", :null => false - t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false - t.string "ssl_type", :limit => 9, :default => "", :null => false - t.binary "ssl_cipher", :null => false - t.binary "x509_issuer", :null => false - t.binary "x509_subject", :null => false - t.integer "max_questions", :default => 0, :null => false - t.integer "max_updates", :default => 0, :null => false - t.integer "max_connections", :default => 0, :null => false - t.integer "max_user_connections", :default => 0, :null => false - t.string "plugin", :limit => 64, :default => "" - t.text "authentication_string" - end - create_table "user_activities", :force => true do |t| t.string "act_type" t.integer "act_id" diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 3857b53e2..46083ea08 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -20,8 +20,8 @@ a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} a.saveBtn:hover {background-color:#297fb8;} .orgMemberList {width:410px; float:left;} .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} -.orgListUser {width:125px; float:left;} -.orgListRole {width:285px; float:left;} +.orgListUser {width:119px; float:left;} +.orgListRole {width:180px; float:left;} .orgMemContainer {width:278px;} .orgMemberAdd {float:right; width:240px;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} From c2e783d78b73363c50fec4763dde37346607b475 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:19:01 +0800 Subject: [PATCH 21/55] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 4 ++-- public/stylesheets/org.css | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 46403094f..dcbd98451 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -25,10 +25,10 @@ <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %>
        - + <%= l(:button_change)%> - + <%= l(:button_cancel)%>
        diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 46083ea08..9b44be938 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -32,6 +32,8 @@ a.saveBtn:hover {background-color:#297fb8;} padding: 2px 5px; border: 1px solid #EAEAEA;} +a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} + /*项目关联css*/ .relateOrg {width:335px;} .relatedList {width:335px;} From df0051cdd4ba33c98a88ab5838b0cb02a9e0cd0c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:26:39 +0800 Subject: [PATCH 22/55] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index dcbd98451..0ac43d12e 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -36,7 +36,7 @@ <% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%> - 编辑 + 编辑 <%= link_to '删除', org_member_path(member.id),:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
        From f1b61c1581010fd3646575827316b3eb25f02897 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:32:15 +0800 Subject: [PATCH 23/55] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E5=B0=86=E4=B8=A2=E5=A4=B1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_member/org_member_autocomplete.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/org_member/org_member_autocomplete.js.erb b/app/views/org_member/org_member_autocomplete.js.erb index b1672038a..05cf3947c 100644 --- a/app/views/org_member/org_member_autocomplete.js.erb +++ b/app/views/org_member/org_member_autocomplete.js.erb @@ -1,5 +1,5 @@ <% if @org%> - var checked = $("#not_org_members input:checked").size(); + var checked = $("#principals_for_new_member input:checked").size(); if(checked > 0) { alert('翻页或搜索后将丢失当前选择的用户数据!'); From e265047ba96e1a81617fa4241d09fac393a47955 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:37:28 +0800 Subject: [PATCH 24/55] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=88=90=E5=91=98?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=9D=A0=E5=8F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/org_member_helper.rb | 2 +- app/helpers/organizations_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/org_member_helper.rb b/app/helpers/org_member_helper.rb index 08313f4e9..fd70a0516 100644 --- a/app/helpers/org_member_helper.rb +++ b/app/helpers/org_member_helper.rb @@ -11,6 +11,6 @@ module OrgMemberHelper links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true } - s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" ) end end diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 33d5dea6e..55a7a5d42 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -14,7 +14,7 @@ module OrganizationsHelper links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true } - s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" ) + s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" ) end end From 99637924b4ce69e17a052285ddd33f3446c7b7cf Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:52:46 +0800 Subject: [PATCH 25/55] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/_new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index 91bcad2a9..b7a9b3a0f 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -15,7 +15,7 @@ <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
        - +
        From b3a234cfc6086290ae591a7d7755fcd3c608a1db Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 12 Nov 2015 19:56:39 +0800 Subject: [PATCH 26/55] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E4=B9=9F=E9=9C=80=E8=A6=81=E5=AF=B9=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index ffa05ff61..ffb04a4f9 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -18,7 +18,7 @@ <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %>
        - +
        From 6ec27761fbaa280a4a97234702249c6b8fa40fe8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 12 Nov 2015 20:57:41 +0800 Subject: [PATCH 27/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8F=8A=E7=BC=BA=E9=99=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 9 +++- app/models/org_member.rb | 1 + app/models/user.rb | 1 + app/views/layouts/_logined_header.html.erb | 3 ++ app/views/layouts/base_org.html.erb | 9 ++-- app/views/org_document_comments/_new.html.erb | 14 +++++- app/views/organizations/_org_members.html.erb | 26 +++++++++++ .../organizations/_show_org_document.html.erb | 44 ++++++++++--------- app/views/organizations/check_uniq.js.erb | 34 +++++++------- app/views/organizations/members.html.erb | 1 + app/views/organizations/new.html.erb | 4 +- config/routes.rb | 1 + 12 files changed, 103 insertions(+), 44 deletions(-) create mode 100644 app/views/organizations/_org_members.html.erb create mode 100644 app/views/organizations/members.html.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 25d0783fb..0356bd48c 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -1,6 +1,6 @@ # encoding: utf-8 class OrganizationsController < ApplicationController - before_filter :find_organization, :only => [:show] + before_filter :find_organization, :only => [:show, :members] layout 'base_org' def index @@ -25,7 +25,7 @@ class OrganizationsController < ApplicationController end def show - if User.current.admin? || User.current.member_of_org?(@organization) + if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') @@ -50,6 +50,7 @@ class OrganizationsController < ApplicationController def check_uniq @check = false; + @org_name = params[:org_name].strip @config_page = params[:config_page] sameName = @config_page ? Organization.where('name = ? and id != ?',params[:org_name],params[:org_id].to_i).count == 0 : Organization.where('name = ?',params[:org_name]).count == 0 if sameName == true @@ -91,4 +92,8 @@ class OrganizationsController < ApplicationController format.js end end + + def members + @members = OrgMember.where("organization_id =?", @organization.id) + end end diff --git a/app/models/org_member.rb b/app/models/org_member.rb index 091c20f22..a1c61f99d 100644 --- a/app/models/org_member.rb +++ b/app/models/org_member.rb @@ -1,6 +1,7 @@ class OrgMember < ActiveRecord::Base attr_accessible :organization_id, :role, :user_id belongs_to :organization + belongs_to :user has_many :roles ,:through => :org_member_roles,:foreign_key => 'role_id' has_many :org_member_roles,:dependent => :destroy diff --git a/app/models/user.rb b/app/models/user.rb index 740523707..79175f42e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -97,6 +97,7 @@ class User < Principal has_many :org_document_comments, :dependent =>:destroy has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source + has_many :org_members belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id #huang ## added by xianbo for delete # has_many :biding_projects, :dependent => :destroy diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index c750ff3b5..ffda9c559 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -86,6 +86,9 @@
      • <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
        • +
      • + <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%> +
      • <%= link_to "退出",signout_path,:class => "menuGrey",:method => "post"%> diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index ef65bf8b2..6209ad260 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -55,13 +55,16 @@
        - <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to '文章', organization_org_document_comments_path(@organization) %> ( <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> -  ) | 成员 ( <%= @organization.org_members.count %>  ) + ) |  + <%= link_to '成员', members_organization_path(@organization.id ) %> （<%= @organization.org_members.count %> )
        • -
        动态
        +
        + <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %> +
        项目
          diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index 91bcad2a9..6c4934f1b 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -1,14 +1,24 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> @@ -30,7 +40,7 @@
          - 确定 + 确定 或 取消
          diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb new file mode 100644 index 000000000..8f80b2997 --- /dev/null +++ b/app/views/organizations/_org_members.html.erb @@ -0,0 +1,26 @@ +<%= stylesheet_link_tag 'courses' %> +
          +

          组织成员

          +
          +
          +
          +
          + + <% members.each do |member| %> +
          + + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> + + <%= l(:label_username)%> + <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %> + <%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> +
          +
          + <% end%> + +
            + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
          +
          +
          +
          \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 72b7e00dc..21e16549c 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -16,28 +16,32 @@ <%= document.content.html_safe %>
          <% end %> -
          -
            -
          • -
              -
            • - <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> - 设为首页 - <% end %> -
              • -
            • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> -
              • -
            • - <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',:remote => true, :class => 'postOptionLink' %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> +
              +
                +
              • +
                  +
                • + <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> + 设为首页 + <% end %> +
                  • +
                • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> +
                  • +
                • + <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', + :data => {:confirm => l(:text_are_you_sure)}, + :remote => true, :class => 'postOptionLink' %> +
                  • +
              -
              • -
            -
          -
        -
        -
        +
        +
        +
        +
        + <% end %> <% comments_for_doc = document.children.reorder("created_at desc") %> <% count = document.children.count() %> diff --git a/app/views/organizations/check_uniq.js.erb b/app/views/organizations/check_uniq.js.erb index 2d295c4d1..f38578025 100644 --- a/app/views/organizations/check_uniq.js.erb +++ b/app/views/organizations/check_uniq.js.erb @@ -1,18 +1,22 @@ -<%if @check == false %> - $checkName = false - <% if @config_page%> - $("#check_name_hint").html('名字不能重复').show(); - <% else%> - $("#organization_name_notice").html('名字不能重复').show(); +<% if !@org_name.blank? %> + <%if @check == false %> + $checkName = false + <% if @config_page%> + $("#check_name_hint").html('名字不能重复').show(); + <% else%> + $("#organization_name_notice").html('名字不能重复').show(); + <%end%> + + <% else %> + $checkName = true; + <% if @config_page%> + $("#check_name_hint").html('名字可以使用').show(); + <% else%> + + $("#organization_name_notice").html('名字可以使用').show(); + <%end%> <%end%> - <% else %> - $checkName = true; - <% if @config_page%> - $("#check_name_hint").html('名字可以使用').show(); - <% else%> - - $("#organization_name_notice").html('名字可以使用').show(); - <%end%> -<%end%> \ No newline at end of file +$("#check_name_hint").html('名字不能为空').show(); +<% end %> \ No newline at end of file diff --git a/app/views/organizations/members.html.erb b/app/views/organizations/members.html.erb new file mode 100644 index 000000000..91e80b232 --- /dev/null +++ b/app/views/organizations/members.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'org_members', :locals => {:members => @members, :organization => @organization} %> \ No newline at end of file diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 2496ac133..08311d51b 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -48,8 +48,8 @@ <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
        @@ -42,7 +48,7 @@
        确定 或 - 取消 + 取消
        diff --git a/app/views/org_member/create.js.erb b/app/views/org_member/create.js.erb index 868dd32b6..f1e48281f 100644 --- a/app/views/org_member/create.js.erb +++ b/app/views/org_member/create.js.erb @@ -3,4 +3,5 @@ <% else %> $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); $("#principals_for_new_member").html(''); + $("#org_members_count_id").html("<%= @org.org_members.count %>"); <% end %> \ No newline at end of file diff --git a/app/views/org_member/destroy.js.erb b/app/views/org_member/destroy.js.erb index 8bd949fde..d87e62c17 100644 --- a/app/views/org_member/destroy.js.erb +++ b/app/views/org_member/destroy.js.erb @@ -1 +1,3 @@ +$("#org_members_count_id").html(""); +$("#org_members_count_id").html("<%= @org.org_members.count %>") $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 21e16549c..03e72263b 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -6,7 +6,12 @@
        <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | 组织 + TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | + <% if defined?(home_id) %> + 首页 + <% else %> + 组织 + <% end %>
        <%= document.title %>
        @@ -16,6 +21,9 @@ <%= document.content.html_safe %>
        <% end %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %>
          diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb index bcebe9d37..b25c4c4d4 100644 --- a/app/views/organizations/set_homepage.js.erb +++ b/app/views/organizations/set_homepage.js.erb @@ -1 +1,2 @@ -location.reload(); \ No newline at end of file +//location.reload(); +window.location.href ='<%= organization_path(@org)%>' \ No newline at end of file diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 2f3610abc..5f1d0e003 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -12,25 +12,29 @@ .homepagePostReplyInputContainer .ke-inline-block {display: none;} .homepagePostReplyInputContainer .ke-container {float: left;} -<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> - - <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id)} %> - <% end %>
          最新动态
          -
            +
          + +<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %> + +
          + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> +
          +<% end %> + <% unless @activities.nil? %> <% @activities.each do |act| %> <% if act.org_act_type == 'CreateOrganization' %> @@ -51,11 +55,12 @@ <% if act.org_act_type == 'OrgDocumentComment' %> - <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> +
          + <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> +
          <% end %> <% end %>
            diff --git a/config/routes.rb b/config/routes.rb index 0cefe29b0..b7acc3bfa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,9 +87,9 @@ RedmineApp::Application.routes.draw do resources :apply_project_masters delete 'apply_project_masters', :to => 'apply_project_masters#delete' - resources :organization, :except => [:show] do - - end + # resources :organization, :except => [:show] do + # + # end resources :school, :except => [:show] do collection do From 465bc9bd6c64d52eb6c5f0f70361df353874da20 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 15:04:50 +0800 Subject: [PATCH 34/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=E6=95=B0=E6=8D=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource_create.js.erb | 2 +- app/views/users/user_resource_delete.js.erb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb index 2d6c4f4d8..f69057273 100644 --- a/app/views/users/user_resource_create.js.erb +++ b/app/views/users/user_resource_create.js.erb @@ -2,6 +2,6 @@ closeModal(); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); //这里不能将翻页的更新 -$("#res_all_count").html(parseInt($("#res_all_count").html())+1); +$("#res_all_count").html('<%= @atta_count%>'); $("#res_count").html(0); $("#checkboxAll").attr('checked',false); \ No newline at end of file diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb index a956ed212..e16abf28d 100644 --- a/app/views/users/user_resource_delete.js.erb +++ b/app/views/users/user_resource_delete.js.erb @@ -1,2 +1,5 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); -$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ No newline at end of file +$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); +$("#res_all_count").html('<%= @atta_count%>') +$("#res_count").html(0); +$("#checkboxAll").attr('checked',false); \ No newline at end of file From 78ebeaee3b98cdd4074da3c6934c11ec0c89c2a9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 15:38:16 +0800 Subject: [PATCH 35/55] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 3bd114e7c..4fd4d0cb9 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -288,7 +288,7 @@ function batch_delete(){ var data = $("#resources_list_form").serialize(); if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){ - alert("含有上传者不是您的资源"); + alert("您只能删除自己上传的资源，请重新选择后再删除。"); return; } if(data != "" && confirm('确认要删除这些资源吗？')) { From 183f019c048737ef8c8757912ec4418d6b95ca3b Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 13 Nov 2015 15:55:29 +0800 Subject: [PATCH 36/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 2 +- app/views/organizations/_org_members.html.erb | 53 ++++++++++--------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 55fd13e7d..8e004d4cb 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -69,7 +69,7 @@ <%= link_to '文章', organization_org_document_comments_path(@organization) %> ( <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> ) |  - <%= link_to '成员', members_organization_path(@organization.id) %> （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id' %>） + <%= link_to '成员', members_organization_path(@organization.id) %> （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
        diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb index 8f80b2997..8719ad275 100644 --- a/app/views/organizations/_org_members.html.erb +++ b/app/views/organizations/_org_members.html.erb @@ -1,26 +1,29 @@ -<%= stylesheet_link_tag 'courses' %> -
        -

        组织成员

        -
        -
        -
        -
        - - <% members.each do |member| %> -
        - - <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> - - <%= l(:label_username)%> - <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %> - <%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> -
        -
        - <% end%> - -
          - <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
        -
        -
        +<%= stylesheet_link_tag 'courses' %> +
        +
        +

        组织成员

        +
        +
        +
        + 加入时间 +
        + + <% members.each do |member| %> +
        + + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> + + <%= l(:label_username)%> + <%= link_to(member.user.show_name, user_path(member.user),:class => "ml5 c_blue02") %>
        + 身份：<%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %> +
        +
        + <% end%> + +
          + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
        +
        +
        +
        \ No newline at end of file From 3451ced8881ec2374f1e82f869a2bb1e81337503 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 16:34:00 +0800 Subject: [PATCH 37/55] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2=E5=8F=8A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 8 +++++ app/views/layouts/_logined_header.html.erb | 3 ++ app/views/layouts/base_org.html.erb | 22 ++++++------ .../organizations/_show_org_document.html.erb | 2 +- app/views/users/user_organizations.html.erb | 35 +++++++++++++++++++ config/routes.rb | 3 +- public/stylesheets/org.css | 8 ++++- 7 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 app/views/users/user_organizations.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0d9588d24..273d48ccf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1910,6 +1910,14 @@ class UsersController < ApplicationController end end + def user_organizations + @user = User.current + @orgs = @user.organizations + respond_to do |format| + format.html {render :layout => 'static_base'} + end + end + private def find_user diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index ffda9c559..6e62e2d5e 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -86,6 +86,9 @@
      • <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
        • +
      • + <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> +
      • <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
        • diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 55fd13e7d..39a6e4fb4 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -76,17 +76,17 @@
        <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
        -
        项目
        -
        - -
        + + + + + + + + + + +
        diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 03e72263b..f1c633320 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -15,7 +15,7 @@
        <%= document.title %>
        - 发帖时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        + 发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
        <% unless document.content.blank? %>
        <%= document.content.html_safe %> diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb new file mode 100644 index 000000000..855dc9c95 --- /dev/null +++ b/app/views/users/user_organizations.html.erb @@ -0,0 +1,35 @@ +<%= stylesheet_link_tag 'pleft','header','new_user','repository','org' %> +<%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> +
        +
        +
        +
        + 组织列表 + +
        + + +
        +
        +
        + <% @orgs.each do |org| %> +
        +
        + <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), :class => "linkGrey2" %> +
        +
        +
        + <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %> +
        +
        <%= org.description %>
        +
        创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %>
        +
        创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %>
        +
        您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %>
        +
        + +
        +
        + <% end %> +
        +
        +
        \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index b7acc3bfa..1ea62752b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -439,6 +439,7 @@ RedmineApp::Application.routes.draw do post 'import_resources_to_homework' get 'dealwith_apply_request' get 'store_selected_resource' + get 'user_organizations' # end end #resources :blogs @@ -485,7 +486,7 @@ RedmineApp::Application.routes.draw do ################# added by william match 'users/tag_save', :via => :post, :as => 'tag' match 'users/tag_saveEx', :via => [:get, :post] - + #get 'users/:id/user_organizations', :to => 'users#user_organizations', :as => 'user_organizations' post 'watchers/watch', :to => 'watchers#watch', :as => 'watch' delete 'watchers/watch', :to => 'watchers#unwatch' get 'watchers/new', :to => 'watchers#new' diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 9b44be938..c8116003e 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -43,4 +43,10 @@ a.cancelBtn:hover {background-color:#717171; color:#ffffff;} .relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} .relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} .relatedListOption {width:80px; text-align:center;} -.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} \ No newline at end of file +.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} + +/*组织列表*/ +.mt28 {margin-top:28px;} +.orgWrap {width:880px; float:left;} +.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } +.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;} \ No newline at end of file From 022c656db6225733fc2da13e237f1c9f7b1212cf Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 17:19:17 +0800 Subject: [PATCH 38/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BB=84=E7=BB=87=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_projects_controller.rb | 13 ++++++++++++ app/controllers/projects_controller.rb | 8 ++++---- app/views/org_projects/destroy.js.erb | 20 ++++++++++++++++++- .../projects/settings/_added_orgs.html.erb | 2 +- app/views/users/user_organizations.html.erb | 2 +- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb index e11005b4a..733df95b7 100644 --- a/app/controllers/org_projects_controller.rb +++ b/app/controllers/org_projects_controller.rb @@ -14,5 +14,18 @@ class OrgProjectsController < ApplicationController @project = Project.find(params[:project_id]) @org_project = OrgProject.find(params[:id]) @org_project.destroy + + condition = '%%' + project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id) + if project_org_ids.empty? + @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page( 1).per(10) + @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count + else + project_org_ids = "(" + project_org_ids.join(',') + ")" + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page( 1).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count + end + # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count + @orgs_page = Paginator.new @org_count, 10,1 end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5e6a584c8..0077bc378 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -77,12 +77,12 @@ class ProjectsController < ApplicationController end project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id) if project_org_ids.empty? - @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) - @org_count = Organization.where("is_public = 1").where("name like ?", condition).count + @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count else project_org_ids = "(" + project_org_ids.join(',') + ")" - @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10) - @org_count = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).count + @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10) + @org_count = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count end # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count @orgs_page = Paginator.new @org_count, 10,params[:page] diff --git a/app/views/org_projects/destroy.js.erb b/app/views/org_projects/destroy.js.erb index 45a014b23..49ea1dc33 100644 --- a/app/views/org_projects/destroy.js.erb +++ b/app/views/org_projects/destroy.js.erb @@ -1,4 +1,22 @@ +//$("#search_orgs_result_list").html(""); +////$("#paginator").css("display", "none"); $("#added_orgs").html(""); +$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') +//$.ajax({ +// url: '<%#= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?page=1', +// type:'get' +//}); $("#search_orgs_result_list").html(""); +$("#search_orgs_result_list").append('
          '); +<% @orgs_not_in_project.each do |org|%> +link = "
          • "; +$("#search_orgs_result_list").append(link ); +<%end %> +$("#search_orgs_result_list").append('
        ') +<% if @org_count > 10 %> +$("#paginator").html(' <%= pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>'); +$("#paginator").css("display", "block"); +<% else %> $("#paginator").css("display", "none"); -$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>') \ No newline at end of file +<% end %> + diff --git a/app/views/projects/settings/_added_orgs.html.erb b/app/views/projects/settings/_added_orgs.html.erb index 06d3ae439..d07ead277 100644 --- a/app/views/projects/settings/_added_orgs.html.erb +++ b/app/views/projects/settings/_added_orgs.html.erb @@ -1,7 +1,7 @@
        • 名称操作
          • <% orgs.each do |org| %> -
        • <%= org.name %> +
        • <%= org.name %> <%= link_to "取消关联", org_project_path(:id => OrgProject.where(:organization_id => org.id, :project_id => project_id).first.id, :project_id => project_id), :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %>
          • diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 855dc9c95..ec66358f5 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -15,7 +15,7 @@ <% @orgs.each do |org| %>
          - <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), :class => "linkGrey2" %> + <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), organization_path(org), :class => "linkGrey2" %>
          From 82541cae1c01e88a39f196419034672a5ab0b0a4 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 Nov 2015 17:57:32 +0800 Subject: [PATCH 39/55] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=97=B6=E5=8E=BB=E6=8E=89=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E7=9A=84label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 0baf31ab2..efaed2d9d 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -17,12 +17,16 @@
          <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%> - -
          + <% if edit_mode %> + + <% end %> +
          <%= calendar_for('homework_end_time')%>
          - + <% if edit_mode %> + + <% end %>
          <%= calendar_for('homework_publish_time')%> From ca770f2727b77a31e7531e2572a8a8085b91b245 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 18:16:41 +0800 Subject: [PATCH 40/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 08311d51b..1ab3ad933 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -31,7 +31,7 @@
        • - （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。） + （打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）
        • From e905489157df9de2c5cc8011905dfc2a8330be4f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 13 Nov 2015 18:23:20 +0800 Subject: [PATCH 41/55] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A2=AB=E5=89=AA?= =?UTF-8?q?=E5=88=87=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 3bf109f37..be178607f 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -581,7 +581,10 @@ } }); - + //查询学校 + $("input[name='province']").on('input', function (e) { + throttle(shcool_search_fn,window,e); + }); function throttle(method,context,e){ clearTimeout(method.tId); @@ -603,10 +606,7 @@ type: 'post', success: function (data) { schoolsResult = data.schools; - count = data.count; //查询学校 - $("input[name='province']").on('input', function (e) { - throttle(shcool_search_fn,window,e); - }); + count = data.count; maxPage = Math.ceil(count/100) //最大页码值 if(schoolsResult.length != undefined && schoolsResult.length != 0) { var i = 0; From a5a413eda018b9231c86d67b5b26c934fdece9a1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 19:46:04 +0800 Subject: [PATCH 42/55] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2sql?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 0352d80f2..5f823ee3d 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -27,8 +27,9 @@ class OrganizationsController < ApplicationController def show if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) - @activities = OrgActivity.where('(org_act_id = ? and org_act_type = ?) || (container_id =? and org_act_type =? and org_act_id !=?)', - @organization.id, 'CreateOrganization ', @organization.id, 'OrgDocumentComment', @organization.home_id).order('updated_at desc') + @activities = OrgActivity.where('container_id =? and container_type =? ', + @organization.id, 'Organization ').order('updated_at desc') + @activities = paginateHelper @activities, 10 else render_403 From 4471b6c4856b9fa6a4a9c380f733873cd94819f5 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 20:14:02 +0800 Subject: [PATCH 43/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/index.html.erb | 4 ++-- app/views/organizations/_org_members.html.erb | 4 ++-- app/views/organizations/show.html.erb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index a7340c08a..a636b2ec8 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -20,8 +20,8 @@ init_activity_KindEditor_data(<%= document.id%>, null, "87%"); }); -
          +

          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %> -

          +

          <% end %> <% end %> \ No newline at end of file diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb index 8719ad275..3940a6576 100644 --- a/app/views/organizations/_org_members.html.erb +++ b/app/views/organizations/_org_members.html.erb @@ -1,11 +1,11 @@ <%= stylesheet_link_tag 'courses' %> -
          +

          组织成员

          - 加入时间 +
          <% members.each do |member| %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index 5f1d0e003..e77cc7d09 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -30,9 +30,9 @@ init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%"); }); -
          +

          <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> -

          +

          <% end %> <% unless @activities.nil? %> @@ -58,9 +58,9 @@ init_activity_KindEditor_data(<%= act.org_act.id%>, null, "87%"); }); -
          +

          <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> -

          +

          <% end %> <% end %>
            From 36b3d0b6368e494e9816f20ae4b37975cf956988 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 13 Nov 2015 20:22:13 +0800 Subject: [PATCH 44/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=8B=90?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8A=E5=8A=A8=E6=80=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=96=87=E7=AB=A0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_organizations.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index ec66358f5..50fa03bbe 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -6,10 +6,10 @@
            组织列表 -
            - - -
            + + + +
            <% @orgs.each do |org| %> From bee355e7478585b8c6946a9c600c75648c5cfaa8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 09:43:15 +0800 Subject: [PATCH 45/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=20=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E5=86=97=E4=BD=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/edit.html.erb | 1 + app/views/org_document_comments/index.html.erb | 1 - app/views/organizations/show.html.erb | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index ffb04a4f9..b4f8662a3 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -21,6 +21,7 @@
          +
          <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %> diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index a636b2ec8..d53ce543c 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -16,7 +16,6 @@ <% @documents.each do |document| %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index e77cc7d09..358b30c7d 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -52,7 +52,7 @@
          <% end %> - <% if act.org_act_type == 'OrgDocumentComment' %> + <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> -

          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %> -

          <% end %> <% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index f1c633320..700db0eeb 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -1,4 +1,4 @@ -
          +
          <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index e77cc7d09..55d296cd1 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -30,9 +30,8 @@ init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%"); }); -

          + <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> -

          <% end %> <% unless @activities.nil? %> @@ -58,9 +57,7 @@ init_activity_KindEditor_data(<%= act.org_act.id%>, null, "87%"); }); -

          <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> -

          <% end %> <% end %>
            diff --git a/db/schema.rb b/db/schema.rb index 1f48eaf02..73924d83c 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 => 20151110011003) do +ActiveRecord::Schema.define(:version => 20151112072948) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -960,6 +960,7 @@ ActiveRecord::Schema.define(:version => 20151110011003) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" From e1a88dedbbe20cc0511cec88274da90763d71788 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 14 Nov 2015 09:58:53 +0800 Subject: [PATCH 47/55] =?UTF-8?q?=20=E9=A6=96=E9=A1=B5=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=20=E4=BC=9A=E5=8F=98=E6=88=90=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_org_document.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 700db0eeb..b9c8c19aa 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -7,7 +7,7 @@
            <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | - <% if defined?(home_id) %> + <% if document.organization.home_id == document.id %> 首页 <% else %> 组织 From f313509d991a170db68c27c4350cbe63b9ae965c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 10:01:30 +0800 Subject: [PATCH 48/55] =?UTF-8?q?=E7=BB=84=E7=BB=87id=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 32ada4729..b1434bb0f 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -50,13 +50,9 @@ <% end %> <% end%>
            -
            组织id：<%= @organization.id %>
            - <% if User.current.admin_of_org?(@organization) %> - 配置 - <% end %> - -
            - <%= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %> + +
            + <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %> <% if @organization.is_public? %> <%= l(:label_public)%> <% else %> @@ -64,6 +60,19 @@ <% end %>
            + <% if User.current.admin_of_org?(@organization) %> + 配置 + <% end %> + + + + + + + + + +
            <%= link_to '文章', organization_org_document_comments_path(@organization) %> ( From 9bf8f6058faeb2d43af2588d537d6bcf22d59f60 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 10:25:51 +0800 Subject: [PATCH 49/55] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=92=8C=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizations/_show_org_document.html.erb | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index b9c8c19aa..4177c3688 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -1,75 +1,76 @@
            -
            -
            - <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %> -
            -
            -
            - <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | - <% if document.organization.home_id == document.id %> - 首页 - <% else %> - 组织 - <% end %> +
            +
            + <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %>
            -
            <%= document.title %>
            -
            - 发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
            - <% unless document.content.blank? %> -
            - <%= document.content.html_safe %> -
            - <% end %> - - <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> -
            -
              -
            • -
                -
              • - <%= form_for('new_form',:url => {:controller => 'organizations',:action => 'set_homepage',:id => document.organization_id, :home_id => document.id},:method => "put",:remote => true) do |f|%> - 设为首页 - <% end %> -
                • -
              • - <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> -
                • -
              • - <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', - :data => {:confirm => l(:text_are_you_sure)}, - :remote => true, :class => 'postOptionLink' %> -
                • -
              -
              • -
            -
            -
            -
            -
            - <% end %> -<% comments_for_doc = document.children.reorder("created_at desc") %> -<% count = document.children.count() %> - -
            -
            -
            回复（<%= count %>）
            - <% if count > 3 %> -
            - - 展开更多 - -
            - <% end %> + <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id) || User.current.id == document.creator_id) %> +
            +
              +
            • +
                +
              • + <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %> + 设为首页 + <% end %> +
                • +
              • + <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :class => "postOptionLink" %> +
                • +
              • + <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete', + :data => {:confirm => l(:text_are_you_sure)}, + :remote => true, :class => 'postOptionLink' %> +
                • +
              +
              • +
            +
            +
            + <% end %> +
            -
            + <% comments_for_doc = document.children.reorder("created_at desc") %> + <% count = document.children.count() %> + +
            +
            +
            回复（<%= count %>）
            + <% if count > 3 %> +
            + + 展开更多 + +
            + <% end %> +
            +
              <% reply_id = 0 %> <% comments_for_doc.each do |comment| %> <% reply_id += 1 %> -
            • +
            • <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %>
              @@ -87,12 +88,12 @@
              - <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %> + <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
              <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id), :method => "post", :remote => true) do |f| %> - +
              @@ -110,15 +111,15 @@
              + diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb new file mode 100644 index 000000000..ed80ba7b1 --- /dev/null +++ b/app/views/organizations/_org_project_issue.html.erb @@ -0,0 +1,136 @@ +
              +
              +
              + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> +
              +
              +
              + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> TO + <%= link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%> +
              +
              + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> + + <%#= get_issue_priority(activity.priority_id)[1] %> + +
              +
              +
              指派给   + <% unless activity.assigned_to_id.nil? %> + <% if activity.try(:assigned_to).try(:realname) == ' ' %> + <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %> + <% end %> + <% end %> +
              +
              + 时间： + <%=format_time(activity.created_on) %> +
              +
              +
              +
              + <% if activity.description? %> + <%= textAreailizable activity, :description, :attachments => activity.attachments %> + <% end %> +
              +
              +
              + + +
              +
              + <% if activity.attachments.any? %> + <% activity.attachments.each do |attachment| %> +
              + + + <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%> + + <% if attachment.is_text? %> + <%= link_to image_tag('magnifier.png'), + :controller => 'attachments', + :action => 'show', + :id => attachment, + :class => 'fl', + :filename => attachment.filename %> + <% end %> + + ( + <%= number_to_human_size attachment.filesize %>) + + + <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>, + <%= format_time(attachment.created_on) %> + +
              + <% end %> + <% end %> +
              +
              +
              +
              + <% count = activity.journals.count %> +
              +
              +
              +
              回复（<%= count %>）
              +
              <%#= format_date(activity.updated_on) %>
              + <% if count > 3 %> +
              + + 展开更多 + +
              + <% end %> +
              + + <% replies_all_i = 0 %> + <% if count > 0 %> +
              +
                + <% activity.journals.reorder("created_on desc").each do |reply| %> + + <% replies_all_i=replies_all_i + 1 %> +
              • +
                + <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %> +
                +
                +
                + <% if reply.try(:user).try(:realname) == ' ' %> + <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_time(reply.created_on) %> +
                +
                + <% if reply.details.any? %> + <% details_to_strings(reply.details).each do |string| %> +

                <%= string %>

                + <% end %> + <% end %> +

                <%= reply.notes %>

                +
                +
                +
                +
                • + <% end %> +
              +
              + <% end %> + + + +
              +
              diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index deaec4437..0b624d479 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -34,8 +34,8 @@ <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %> <% end %> - <% unless @activities.nil? %> - <% @activities.each do |act| %> + <% unless @org_activities.nil? %> + <% @org_activities.each do |act| %> <% if act.org_act_type == 'CreateOrganization' %>
              @@ -60,10 +60,20 @@ <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %> <% end %> <% end %> -
                - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
              + + <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> + <% end %> + <%# @org_project_activties.each do |org_act|%> + <%= render :partial => 'organizations/org_project_activities', + :locals => {:org_project_activties =>@org_project_activties, + :page=>@page, + :org => @organization, + :org_act_count=>@org_activities.count, + :pro_act_count=>@org_project_activties.count}%> + <%# end %> + + diff --git a/app/views/organizations/show.js.erb b/app/views/organizations/show.js.erb new file mode 100644 index 000000000..b0a447910 --- /dev/null +++ b/app/views/organizations/show.js.erb @@ -0,0 +1,7 @@ +$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'organizations/org_project_activities', + :locals => {:org_project_activties =>@org_project_activties, + :page=>@page, + :org => @organization, + :org_act_count=>@org_activities.count, + :pro_act_count=>@org_project_activties.count} )%>"); + From 1e1c2109396bdcd00c092e7efc9da3b2d7bce42b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 14:57:49 +0800 Subject: [PATCH 53/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- .../_org_project_activities.html.erb | 8 +- .../organizations/_org_project_issue.html.erb | 2 +- .../organizations/_project_create.html.erb | 38 +++++++ .../organizations/_project_message.html.erb | 100 ++++++++++++++++++ 5 files changed, 143 insertions(+), 7 deletions(-) create mode 100644 app/views/organizations/_project_create.html.erb create mode 100644 app/views/organizations/_project_message.html.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index daf443d07..cad617e47 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -60,7 +60,7 @@ class OrganizationsController < ApplicationController @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @organization.id, 'Organization ').order('updated_at desc').count project_ids = @organization.projects.map(&:id) - @org_project_activties = ForgeActivity.where('project_id in (?)',project_ids.join(',')).page(params[:page]).per(10) + @org_project_activties = ForgeActivity.where('project_id in (?) and forge_act_type in("Issue","Message","ProjectCreateInfo")',project_ids.join(',')).order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 @page = params[:page] diff --git a/app/views/organizations/_org_project_activities.html.erb b/app/views/organizations/_org_project_activities.html.erb index 0a6a8fae4..b46996661 100644 --- a/app/views/organizations/_org_project_activities.html.erb +++ b/app/views/organizations/_org_project_activities.html.erb @@ -1,17 +1,15 @@ <% org_project_activties.each do |act|%> <% if act %> - - <% unless act.forge_act_type == "ProjectCreateInfo" %> <% if act %> <% case act.forge_act_type.to_s %> <% when 'Issue' %> <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> <% when 'Message' %> - <%= render :partial => 'users/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> + <%= render :partial => 'organizations/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> <% when 'ProjectCreateInfo'%> - <%= render :partial => 'users/project_create', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %> + <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %> <% end %> - <% end %><% end %> + <% end %> <% end %> <% end %> <% if org_act_count == 10 || pro_act_count == 10 %> diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index ed80ba7b1..573429752 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -120,7 +120,7 @@

              <%= string %>

              <% end %> <% end %> -

              <%= reply.notes %>

              +

              <%= reply.notes.nil? ? "" : reply.notes.html_safe %>

              diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb new file mode 100644 index 000000000..d966d8e18 --- /dev/null +++ b/app/views/organizations/_project_create.html.erb @@ -0,0 +1,38 @@ +<% project = Project.find(activity.project_id) %> +<% user = User.find(project.user_id)%> +
              +
              +
              + <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %> +
              +
              +
              + <% if user.try(:realname) == ' ' %> + <%= link_to user, user_path(user), :class => "newsBlue mr15" %> + <% else %> + <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %> +
              +
              + <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %> +
              +
              + 创建时间：<%= format_time(project.created_on) %> +
              + +
              +
              +
              +
              \ No newline at end of file diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb new file mode 100644 index 000000000..85ed08f2f --- /dev/null +++ b/app/views/organizations/_project_message.html.erb @@ -0,0 +1,100 @@ +
              +
              +
              + <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> +
              +
              +
              + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> + <% end %> + TO + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%> + +
              +
              + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" + %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey" + %> + <% end %> +
              +
              + 时间：<%= format_time(activity.created_on) %> +
              +
              +
              + <% if activity.parent_id.nil? %> + <%= activity.content.to_s.html_safe%> + <% else %> + <%= activity.parent.content.to_s.html_safe%> + <% end %> +
              +
              +
              + + +
              +
              +
              +
              + <% count = 0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %> +
              +
              +
              +
              回复( + <%=count %> + )
              +
              <%#=format_date(activity.updated_on)%>
              + <%if count>3 %> +
              展开更多
              + <% end %> +
              + + <% activity= activity.parent_id.nil? ? activity : activity.parent %> + <% replies_all_i = 0 %> + <% if count > 0 %> +
              +
                + <% activity.children.reorder("created_on desc").each do |reply| %> + + <% replies_all_i=replies_all_i+1 %> +
              • +
                + <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %> +
                +
                +
                + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_time(reply.created_on) %> +
                +
                + <%= reply.content.html_safe %>
                +
                +
                +
                • + <% end %> +
              +
              + <% end %> + + +
              +
              \ No newline at end of file From c9a7a9476708916f5836309640f4ea82b3c6e863 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 15:15:54 +0800 Subject: [PATCH 54/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index cad617e47..774cde02d 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -60,7 +60,7 @@ class OrganizationsController < ApplicationController @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @organization.id, 'Organization ').order('updated_at desc').count project_ids = @organization.projects.map(&:id) - @org_project_activties = ForgeActivity.where('project_id in (?) and forge_act_type in("Issue","Message","ProjectCreateInfo")',project_ids.join(',')).order("updated_at desc").page(params[:page] || 1).per(10) + @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10 @page = params[:page] From f5460d11264d67a19809f229928f1dd02207efae Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 14 Nov 2015 15:19:49 +0800 Subject: [PATCH 55/55] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 774cde02d..b75742164 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -59,7 +59,7 @@ class OrganizationsController < ApplicationController @organization.id, 'Organization ').order('updated_at desc').page(params[:page]).per(10) @org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @organization.id, 'Organization ').order('updated_at desc').count - project_ids = @organization.projects.map(&:id) + project_ids = @organization.projects.map(&:id) << 0 @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count #@org_activities = paginateHelper @org_activities, 10