hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

Browse Source 
Conflicts:
	app/views/projects/_invite_members_by_mail.html.erb
memcached_alan
alan 11 years ago
parent 48ac3dbea8 0f2ded4d25
commit 838c39da69
15 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File

4
app/controllers/admin_controller.rb
Unescape View File

@ -336,4 +336,8 @@ class AdminController < ApplicationController
end end
def create_version
end
end end

2
app/controllers/users_controller.rb
Unescape View File

@ -443,6 +443,7 @@ class UsersController < ApplicationController
activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc') activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc')
else else
activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
end
activity = activity.reject { |e| activity = activity.reject { |e|
!User.current.admin? && !User.current.admin? &&
(((e.act_type == "Issue") && !e.act.project.visible?(User.current)) || (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
@ -451,7 +452,6 @@ class UsersController < ApplicationController
(e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) || (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
(e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))) (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
} }
end
@activity_count = activity.count @activity_count = activity.count
@activity_pages = Paginator.new @activity_count, pre_count, params['page'] @activity_pages = Paginator.new @activity_count, pre_count, params['page']
@activity = activity.slice(@activity_pages.offset,@activity_pages.per_page) @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)

4
app/services/courses_service.rb
Unescape View File

@ -158,9 +158,9 @@ class CoursesService
#显示课程 #显示课程
def show_course(params,currnet_user) def show_course(params,current_user)
course = Course.find(params[:id]) course = Course.find(params[:id])
unless (course.is_public == 1 || currnet_user.member_of_course?(@course)|| currnet_user.admin?) unless (course.is_public == 1 || current_user.member_of_course?(course) || current_user.admin?)
raise '403' raise '403'
end end
{:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)} {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}

3
app/views/admin/mobile_version.html.erb
Unescape View File

@ -2,9 +2,8 @@
<a href="javascript:void(0)" onclick="$('#new_version').slideToggle(400); ">发布新版本</a> <a href="javascript:void(0)" onclick="$('#new_version').slideToggle(400); ">发布新版本</a>
<div> <div>
<form id="new_version" style="display: none"> <form id="new_version" style="display: none">
发布新版本
</form> </form>
</div> </div>
<br/> <br/>
<div>当前版本:</div> <div>当前版本:</div>

2
app/views/boards/_project_show.html.erb
Unescape View File

@ -45,7 +45,7 @@
<%= link_to @topic_count,:controller => 'boards',:action => 'index' %> <%= link_to @topic_count,:controller => 'boards',:action => 'index' %>
个贴子 个贴子
</span> </span>
<% if @project.enabled_modules.where("name = 'boards'").count > 0 %> <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
<span> <span>
<%= link_to l(:label_message_new), <%= link_to l(:label_message_new),
new_board_message_path(@board), new_board_message_path(@board),

9
app/views/news/_project_news.html.erb
Unescape View File

@ -1,3 +1,6 @@
<div class="project_r_h">
<h2 class="project_h2"><%= l(:label_news) %></h2>
</div>
<script type="text/javascript"> <script type="text/javascript">
function regexTitle() function regexTitle()
{ {
@ -66,11 +69,7 @@
label_tips = l(:label_news) label_tips = l(:label_news)
end end
%> %>
<% if @project.enabled_modules.where("name = 'news'").count > 0 && User.current.member_of?(@project) %>
<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
<%= label_tips %>
</span>
<% if @project.enabled_modules.where("name = 'news'").count > 0 %>
<%= link_to(btn_tips, <%= link_to(btn_tips,
new_project_news_path(@project), new_project_news_path(@project),
:class => 'icon icon-add', :class => 'icon icon-add',

3
app/views/news/_project_show.html.erb
Unescape View File

@ -1,3 +1,6 @@
<div class="project_r_h">
<h2 class="project_h2"><%= l(:label_news) %></h2>
</div>
<script type="text/javascript"> <script type="text/javascript">
function regexTitle() function regexTitle()
{ {

3
app/views/projects/_tools_expand.html.erb
Unescape View File

@ -3,6 +3,9 @@
<%= link_to l(:label_settings), settings_project_path(@project) %> <%= link_to l(:label_settings), settings_project_path(@project) %>
<% end %> <% end %>
</li> </li>
<li>
<%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
</li>
<li> <li>
<%= link_to l(:project_module_wiki), project_wiki_path(@project) %> <%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
</li> </li>

2
app/views/projects/invite_members.html.erb
Unescape View File

@ -39,7 +39,7 @@
<% end %> <% end %>
</p> </p>
<p> <p>
<%= submit_tag l(:button_add), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %> <%= submit_tag l(:label_invite_members), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
</p> </p>
<% end %> <% end %>
<% end %> <% end %>

1
app/views/projects/invite_members_by_mail.html.erb
Unescape View File

@ -1,2 +1 @@
<%= stylesheet_link_tag 'project', :media => 'all' %>
<%= render :partial => "invite_members_by_mail"%> <%= render :partial => "invite_members_by_mail"%>

3
app/views/projects/show.html.erb
Unescape View File

@ -21,7 +21,8 @@
<div class="scroll"> <div class="scroll">
<% unless @events_pages.empty? %> <% unless @events_pages.empty? %>
<% @events_pages.each do |e| -%> <% @events_pages.each do |e| -%>
<% act = e.forge_act %> <% act = e.forge_act;
next if act.nil? %>
<% if e.forge_act_type == "Issue" %> <% if e.forge_act_type == "Issue" %>
<div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;margin-top: 10px;"> <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;margin-top: 10px;">
<div class="activity-avatar" style="float: left; margin:3px; height: 100%;"> <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">

6
config/initializers/kaminari_config.rb
Unescape View File

@ -23,10 +23,10 @@
Kaminari.configure do |config| Kaminari.configure do |config|
# config.default_per_page = 25 # config.default_per_page = 25
# config.max_per_page = nil # config.max_per_page = nil
# config.window = 4 config.window = 2
# config.outer_window = 3 # config.outer_window = 3
# config.left = 0 # config.left = 2
# config.right = 0 # config.right = 2
# config.page_method_name = :page # config.page_method_name = :page
# config.param_name = :page # config.param_name = :page
end end

1
config/locales/zh.yml
Unescape View File

@ -1929,6 +1929,7 @@ zh:
label_bids_task_list: 作业列表 label_bids_task_list: 作业列表
label_join_course: 加入 label_join_course: 加入
label_invite_project: 邀请您加入项目 label_invite_project: 邀请您加入项目
label_invite_members: 邀请用户
label_exit_course: 退出 label_exit_course: 退出
label_exit_group: 退出当前分班 label_exit_group: 退出当前分班
label_new_join: 加入 label_new_join: 加入

1
config/routes.rb
Unescape View File

@ -645,6 +645,7 @@ RedmineApp::Application.routes.draw do
match 'admin/web_footer_made', as: :web_footer_made match 'admin/web_footer_made', as: :web_footer_made
match 'admin/enterprise_page_made', as: :enterprise_page_made match 'admin/enterprise_page_made', as: :enterprise_page_made
match 'admin/mobile_version', as: :mobile_version match 'admin/mobile_version', as: :mobile_version
match 'admin/create_version', as: :create_version
match 'admin/search', :via => [:get, :post] match 'admin/search', :via => [:get, :post]
match 'admin/plugins', :via => :get match 'admin/plugins', :via => :get
match 'admin/info', :via => :get match 'admin/info', :via => :get

2
public/stylesheets/application.css
Unescape View File

@ -91,7 +91,7 @@ a:hover.more{ color:#64bdd9;}
.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
.box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
/*邮件邀请*/ /*邮件邀请*/
.box_main{ width:345px; margin:0 auto;} .box_main{ width:345px; margin:0 auto;padding-left:40px;}
.box_h3{ color:#15bccf; text-align:center; font-size:16px;} .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
.box_p{ color:#404040; margin-bottom:5px;} .box_p{ color:#404040; margin-bottom:5px;}
.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;} .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}

Write Preview
Loading…
Cancel
Save