From 91d5959016bac60c7779778ab525b8f9abc6e101 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Tue, 22 Apr 2014 10:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=91=98=E7=94=B3=E8=AF=B7=E7=9A=84=E6=8E=A5=E5=8F=97?=
=?UTF-8?q?=E4=B8=8E=E6=8B=92=E7=BB=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../open_source_projects_controller.rb | 39 +++++++++++++------
app/helpers/open_source_projects_helper.rb | 3 +-
.../master_apply.html.erb | 23 +++++------
config/routes.rb | 2 +
4 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/app/controllers/open_source_projects_controller.rb b/app/controllers/open_source_projects_controller.rb
index fa1f1905..4feca7b2 100644
--- a/app/controllers/open_source_projects_controller.rb
+++ b/app/controllers/open_source_projects_controller.rb
@@ -1,7 +1,7 @@
class OpenSourceProjectsController < ApplicationController
- before_filter :find_osp, :only => [:master_apply]
- before_filter :require_master, :only => [:master_apply]
+ before_filter :find_osp, :only => [:master_apply, :accept_master_apply, :refuse_master_apply]
+ before_filter :require_master, :only => [:master_apply, :accept_master_apply, :refuse_master_apply]
helper :sort
include SortHelper
@@ -146,20 +146,37 @@ class OpenSourceProjectsController < ApplicationController
end
def search
- per_page_option = 10
-
- @open_source_projects = OpenSourceProject.filter(@app_dir, @language, @created_at)
- @open_source_projects = @open_source_projects.like(params[:name]) if params[:name].present?
-
- @os_project_count = @open_source_projects.count
- @os_project_pages = Paginator.new @os_project_count, per_page_option, params['page']
-
- @open_source_projects = @open_source_projects.offset(@os_project_pages.offset).limit(@os_project_pages.per_page)
+ # per_page_option = 10
+#
+ # @open_source_projects = OpenSourceProject.filter(@app_dir, @language, @created_at)
+ # @open_source_projects = @open_source_projects.like(params[:name]) if params[:name].present?
+#
+ # @os_project_count = @open_source_projects.count
+ # @os_project_pages = Paginator.new @os_project_count, per_page_option, params['page']
+#
+ # @open_source_projects = @open_source_projects.offset(@os_project_pages.offset).limit(@os_project_pages.per_page)
redirect_to open_source_projects_path(:name => params[:name])
end
+ def refuse_master_apply
+ @apply = ApplyProjectMaster.where("user_id = ? and apply_id = ? and apply_type = 'OpenSourceProject'", params[:user_id], @open_source_project.id)
+ @apply.first.destory
+
+ redirect_to master_apply_open_source_project_path
+ end
+
+ def accept_master_apply
+ @apply = ApplyProjectMaster.where("user_id = ? and apply_id = ? and apply_type = 'OpenSourceProject'", params[:user_id], @open_source_project.id)
+ if @apply.count == 1
+ @apply.first.update_attributes(:status => 2)
+ end
+
+ redirect_to master_apply_open_source_project_path
+ end
+
+
private
def require_master
diff --git a/app/helpers/open_source_projects_helper.rb b/app/helpers/open_source_projects_helper.rb
index 6c9060c1..69ce66c6 100644
--- a/app/helpers/open_source_projects_helper.rb
+++ b/app/helpers/open_source_projects_helper.rb
@@ -26,7 +26,8 @@ module OpenSourceProjectsHelper
s_temp = content_tag('span', s_temp, :class => 'tag_show')
s << content_tag('div', s_temp, :id => 'tag')
end
+ s = content_tag('div', s, :id => 'tags_show')
s = content_tag('div', s, :id => 'tags')
- # s = content_tag('div', s, :class => 'tags')
+ s = content_tag('div', s, :class => 'user_tags')
end
end
diff --git a/app/views/open_source_projects/master_apply.html.erb b/app/views/open_source_projects/master_apply.html.erb
index 8120d780..0288692f 100644
--- a/app/views/open_source_projects/master_apply.html.erb
+++ b/app/views/open_source_projects/master_apply.html.erb
@@ -6,19 +6,19 @@
<% messages_count = user.messages.count %>
<% messages_score = messages_count * 0.05%>
<% finall_messages_score = messages_score %>
-
+
<% journals_count = user.journals.count %>
<% journals_score = journals_count * 0.1 %>
<% user_changesets_count = user.changesets.count %>
<% user_changesets_score = user_changesets_count * 0.3 %>
<% finall_user_project_score = journals_score + user_changesets_score %>
-
+
<% journals_for_messages_count = user.journals_for_messages.count %>
<% activities_count = user.activities.count %>
<% journals_for_messages_score = journals_for_messages_count * 0.05 %>
<% activities_score = activities_count * 0.2 %>
<% finall_activity_score = journals_for_messages_score + activities_score %>
-
+
<% news_count = user.news.count %>
<% news_score = news_count * 0.1 %>
<% wiki_contents_count = user.wiki_contents.count %>
@@ -36,17 +36,16 @@
<%= image_tag(url_to_avatar(user), :class => 'avatar') %>
<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-
+
- <%= l(:label_user_grade) %>:
- <%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users',
- :action => 'show_score',
- :remote => true,
- :id => user.id},
- :style=>"color: #EC6300;") %>
+ <%= l(:label_user_grade) %>: <%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users',
+ :action => 'show_score',
+ :remote => true,
+ :id => user.id},
+ :style=>"color: #EC6300;") %>
-
+
@@ -76,6 +75,8 @@
<%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
+ <%= link_to "同意申请", {:controller => 'open_source_projects', :action => 'accept_master_apply', :id => @open_source_project.id, :user_id => user.id}%>
+ <%= link_to "拒绝申请", {:controller => 'open_source_projects', :action => 'refuse_master_apply', :id => @open_source_project.id, :user_id => user.id}%>
<% end -%>
diff --git a/config/routes.rb b/config/routes.rb
index 5fbd3b43..a09a7550 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,6 +33,8 @@ RedmineApp::Application.routes.draw do
resources :relative_memos
member do
match 'master_apply', via: [:get, :post]
+ match 'accept_master_apply', via: [:get, :post]
+ match 'refuse_master_apply', via: [:get, :post]
end
end