Merge remote-tracking branch 'origin/szzh' into guange_dev

app/controllers/projects_controller.rb

@@ -248,16 +248,9 @@ class ProjectsController < ApplicationController
     # 2、加入项目、创建角色
     # 3、用户得分
     if params[:login]
-      login = params[:login]
+      # 自动激活用户
-      login = login.sub(/%40/,'@')
+      user.status = 1
-      mail = params[:login]
+      user.save
-      password = params[:password]
-      us = UsersService.new
-      user = us.register_auto(login,mail, password)
-
-      Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
-      UserGrade.create(:user_id => user.id, :project_id => @project.id)
-      User.current = user unless User.current.nil?
     end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return

app/models/mailer.rb

@@ -52,9 +52,20 @@ class Mailer < ActionMailer::Base
     @email = email
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
     @password = newpass(6)
-    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,
+
-                             :password => @password,
+    login = email
-                             :login => email)
+    login = login.sub(/%40/,'@')
+    us = UsersService.new
+    # 自动激活用户
+    user = us.register_auto(login, @email, @password)
+
+    Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id)
+    UserGrade.create(:user_id => user.id, :project_id => project.id)
+    User.current = user unless User.current.nil?
+    @user = user
+    @token = Token.get_token_from_user(user, 'autologin')
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value
+                           )
     mail :to => email, :subject => @subject
   end
 

app/models/principal.rb

@@ -19,6 +19,7 @@ class Principal < ActiveRecord::Base
   self.table_name = "#{table_name_prefix}users#{table_name_suffix}"
 
   # Account statuses
+  # 0 全部；1 活动的； 2 已注册； 3 锁定
   STATUS_ANONYMOUS  = 0
   STATUS_ACTIVE     = 1
   STATUS_REGISTERED = 2

app/views/files/_project_file_new.html.erb

@@ -5,8 +5,8 @@
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show_project',:locals => {:project => project}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>")
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().css("top","40%").css("left","30%");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 

app/views/layouts/_join_exit_project.html.erb

@@ -12,12 +12,12 @@
       <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %>
   <% end %>
   <!--项目类型-->
-  <% if (User.current.login? && User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s.include?("Manager")) || User.current.admin? %>
+  <% if (User.current.login? && User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager")) || User.current.admin? %>
       <%= link_to "<span class='#{typeclass}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>
   <% end %>
   <!--退出项目-->
   <% if (User.current.member_of? @project) && User.current.login? && !User.current.admin &&
-     !Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s.include?("Manager") %>
+     !Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
 

db/schema.rb

@@ -654,6 +654,16 @@ ActiveRecord::Schema.define(:version => 20150428021035) 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"

public/stylesheets/project.css

@@ -222,7 +222,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
 
 /*上传资源弹出框样式*/
-/*#popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}*/
+.popbox_polls{position:fixed !important;}
 .upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
 .upload_box{ width:430px; margin:15px auto;}
 
@@ -338,7 +338,7 @@ a:hover.st_add{ color:#ff8e15;}
 .newpro_box input{  height:26px; float:left; margin-bottom:10px;}
 .newpro_box textarea{  height:150px; float:left; margin-bottom:10px;}
 .newpro_box select{ height:29px; float:left; margin-bottom:10px;}
-.label{ width:80px; text-align:right; font-size:14 background-image: url(../images/true.png); }
+.label{ width:80px; text-align:right; font-size:14px; background-image: url(../images/true.png); }
 .icon-reload  { background-image: url(../images/reload.png); }
 .icon {
     background-position: 0% 50%;
@@ -433,7 +433,7 @@ span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.p
 /*日历选择图*/
 img.ui-datepicker-trigger {
   display:block;
-  background:url(/images/public_icon.png) -31px 0 no-repeat;	
+  background:url(../images/public_icon.png) -31px 0 no-repeat;
   cursor: pointer;
   vertical-align: middle;
   margin-left: 5px;