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

Merge branch 'szzh' into develop

Browse Source
gitlab_guange v20151127_02
huang 10 years ago
parent 634e11d0ec a6d3ff2b14
commit 45b94bd22d
8 changed files with 89 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/org_document_comments_controller.rb
Unescape View File

@ -39,7 +39,7 @@ class OrgDocumentCommentsController < ApplicationController
end end
respond_to do |format| respond_to do |format|
format.html { format.html {
if params[:flag] == 0 if params[:flag].to_i == 0
redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id) redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
else else
redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id) redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)

45
app/controllers/organizations_controller.rb
Unescape View File

@ -161,7 +161,7 @@ class OrganizationsController < ApplicationController
def more_org_projects def more_org_projects
@organization = Organization.find params[:id] @organization = Organization.find params[:id]
@page = params[:page] @page = params[:page]
@org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5) @org_projects = @organization.projects.reorder('created_at').uniq.page((params[:page].to_i || 1) +1).per(5)
respond_to do |format| respond_to do |format|
format.js format.js
end end
@ -170,7 +170,7 @@ class OrganizationsController < ApplicationController
def more_org_courses def more_org_courses
@organization = Organization.find(params[:id]) @organization = Organization.find(params[:id])
@page = params[:page] @page = params[:page]
@org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5) @org_courses = @organization.courses.reorder('created_at').uniq.page((params[:page].to_i || 1) + 1 ).per(5)
respond_to do |format| respond_to do |format|
format.js format.js
end end
@ -189,16 +189,17 @@ class OrganizationsController < ApplicationController
if !params[:name].nil? if !params[:name].nil?
condition = "%#{params[:name].strip}%".gsub(" ","") condition = "%#{params[:name].strip}%".gsub(" ","")
end end
#sql = "select courses.* from courses inner join members on courses.id = members.course_id inner join org_courses on courses.id = org_courses.course_id where org_courses.organization_id != #{@organization.id} and members.user_id = #{User.current.id} and courses.name like '#{condition}'" sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"+
sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'" "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id})"
user_courses = Course.find_by_sql(sql) #user_courses = Course.find_by_sql(sql)
@added_course_ids = @organization.courses.map(&:id) @courses = Course.find_by_sql(sql)
@courses = [] # @added_course_ids = @organization.courses.map(&:id)
user_courses.each do |course| # @courses = []
if !@added_course_ids.include?(course.id) # user_courses.each do |course|
@courses << course # if !@added_course_ids.include?(course.id)
end # @courses << course
end # end
# end
end end
def join_courses def join_courses
@ -225,15 +226,17 @@ class OrganizationsController < ApplicationController
if !params[:name].nil? if !params[:name].nil?
condition = "%#{params[:name].strip}%".gsub(" ","") condition = "%#{params[:name].strip}%".gsub(" ","")
end end
sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" +
user_projects = Course.find_by_sql(sql) " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id})"
@added_course_ids = @organization.projects.map(&:id) #user_projects = Course.find_by_sql(sql)
@projects = [] @projects = Course.find_by_sql(sql)
user_projects.each do |project| # @added_course_ids = @organization.projects.map(&:id)
if !@added_course_ids.include?(project.id) # @projects = []
@projects << project # user_projects.each do |project|
end # if !@added_course_ids.include?(project.id)
end # @projects << project
# end
# end
end end
def join_projects def join_projects

4
app/views/layouts/base_org.html.erb
Unescape View File

@ -104,7 +104,7 @@
</div> </div>
<div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuProjects"> <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuProjects">
<ul > <ul >
<%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%> <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
<!--<%#= @organization.org_projects.each do |p|%>--> <!--<%#= @organization.org_projects.each do |p|%>-->
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>--> <!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
<!--<%# end %>--> <!--<%# end %>-->
@ -131,7 +131,7 @@
</div> </div>
<div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuCourses"> <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuCourses">
<ul > <ul >
<%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%> <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
</ul> </ul>
</div> </div>
</div> </div>

2
app/views/organizations/join_courses.js.erb
Unescape View File

@ -1,5 +1,5 @@
$("#homepageLeftMenuCourses").html(""); $("#homepageLeftMenuCourses").html("");
$("#homepageLeftMenuCourses").append("<ul>"); $("#homepageLeftMenuCourses").append("<ul>");
$("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses', $("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses',
:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1}) %>"); :locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>");
$("#homepageLeftMenuCourses").append("</ul>"); $("#homepageLeftMenuCourses").append("</ul>");

2
app/views/organizations/join_projects.js.erb
Unescape View File

@ -1,5 +1,5 @@
$("#homepageLeftMenuProjects").html(""); $("#homepageLeftMenuProjects").html("");
$("#homepageLeftMenuProjects").append("<ul>"); $("#homepageLeftMenuProjects").append("<ul>");
$("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects', $("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects',
:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1}) %>"); :locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>");
$("#homepageLeftMenuProjects").append("</ul>"); $("#homepageLeftMenuProjects").append("</ul>");

2
app/views/student_work/_student_work_list.html.erb
Unescape View File

@ -1,5 +1,5 @@
<div class="fl" style="padding-bottom:10px; width:720px;"> <div class="fl" style="padding-bottom:10px; width:720px;">
<span class="c_dark f14 fb fl mr30"> <span class="c_dark f14 fb fl mr15">
作品 作品
<font class="f12 c_red"> <font class="f12 c_red">
(<%= @student_work_count%>人已交) (<%= @student_work_count%>人已交)

10
app/views/users/_user_message_course.html.erb
Unescape View File

@ -411,7 +411,9 @@
<!-- 创建课程消息 --> <!-- 创建课程消息 -->
<% if ma.course_message_type == "Course" %> <% if ma.course_message_type == "Course" %>
<ul class="homepageNewsList fl"> <ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li> <li class="homepageNewsPortrait fl">
<a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
</li>
<li class="homepageNewsPubType fl"> <li class="homepageNewsPubType fl">
<span class="newsBlue homepageNewsPublisher">系统提示</span> <span class="newsBlue homepageNewsPublisher">系统提示</span>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span> <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
@ -443,7 +445,7 @@
<% end %> <% end %>
<% if ma.course_message_type == "JoinCourseRequest" %> <% if ma.course_message_type == "JoinCourseRequest" %>
<ul class="homepageNewsList fl"> <ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li> <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
<li class="homepageNewsPubType fl"> <li class="homepageNewsPubType fl">
<span class="newsBlue homepageNewsPublisher">系统提示</span> <span class="newsBlue homepageNewsPublisher">系统提示</span>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span> <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
@ -482,7 +484,7 @@
<% end %> <% end %>
<% if ma.course_message_type == "CourseRequestDealResult" %> <% if ma.course_message_type == "CourseRequestDealResult" %>
<ul class="homepageNewsList fl"> <ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li> <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
<li class="homepageNewsPubType fl"> <li class="homepageNewsPubType fl">
<span class="newsBlue homepageNewsPublisher">系统提示</span> <span class="newsBlue homepageNewsPublisher">系统提示</span>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"> <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
@ -548,7 +550,7 @@
<% if ma.course_message_type == "JoinCourse" and ma.status == 1 %> <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
<ul class="homepageNewsList fl"> <ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"> <li class="homepageNewsPortrait fl">
<a href="javascript:void(0);"></a> <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
</li> </li>
<li class="homepageNewsPubType fl"> <li class="homepageNewsPubType fl">
<span class="newsBlue homepageNewsPublisher">系统提示</span> <span class="newsBlue homepageNewsPublisher">系统提示</span>

4
public/stylesheets/courses.css
Unescape View File

@ -60,11 +60,11 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
.hworkStName {width:60px; max-width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .hworkStName {width:60px; max-width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
.hworkStID {width:80px; max-width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .hworkStID {width:80px; max-width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
.hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;} .hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;}
.hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2;} .hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2; z-index:99;}
a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;} a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;}
a.hworkSetting {background:url(../images/homepage_icon2.png) -10px -450px no-repeat; padding-left:23px;} a.hworkSetting {background:url(../images/homepage_icon2.png) -10px -450px no-repeat; padding-left:23px;}
.hworkInfor {font-size:12px; color:#269ac9; width:80px; height:40px; vertical-align:middle; float:left; line-height:40px; text-align:center; font-weight:bold;} .hworkInfor {font-size:12px; color:#269ac9; width:80px; height:40px; vertical-align:middle; float:left; line-height:40px; text-align:center; font-weight:bold;}
.infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px;} .infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px; z-index:99;}
.problemTxt {width:660px; margin-left:10px; color:#777777; position:relative;} .problemTxt {width:660px; margin-left:10px; color:#777777; position:relative;}
.rTxtTit{width:560px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#269ac9; font-size:14px;} .rTxtTit{width:560px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#269ac9; font-size:14px;}
.hworkSearchBox {border:1px solid #e6e6e6; width:185px; float:left; background-color:#ffffff;} .hworkSearchBox {border:1px solid #e6e6e6; width:185px; float:left; background-color:#ffffff;}

Write Preview
Loading…
Cancel
Save