changed get patent and fixed intro
This commit is contained in:
parent
7bf694f717
commit
57c9fd5d6c
|
@ -49,9 +49,9 @@ class Admin::TechnologyTransfersController < OrbitMemberController
|
|||
end
|
||||
|
||||
def update_frontend_setting
|
||||
@member = MemberProfile.find(intro_params['member_profile_id']) rescue nil
|
||||
@intro = CourseIntro.find_by(:member_profile_id=>@member.id) rescue nil
|
||||
@intro = @intro.nil? ? CourseIntro.new({:member_profile_id=>@member.id}) : @intro
|
||||
@member = MemberProfile.find(params['member_profile_id']) rescue nil
|
||||
@intro = TechnologyTransferIntro.find_by(:member_profile_id=>@member.id) rescue nil
|
||||
@intro = @intro.nil? ? TechnologyTransferIntro.new({:member_profile_id=>@member.id}) : @intro
|
||||
@intro.update_attributes(intro_params)
|
||||
@intro.save
|
||||
redirect_to URI.encode('/admin/members/'+@member.to_param+'/TechnologyTransfer')
|
||||
|
@ -59,7 +59,7 @@ class Admin::TechnologyTransfersController < OrbitMemberController
|
|||
|
||||
def toggle_hide
|
||||
if params[:ids]
|
||||
@projects = Course.any_in(_id: params[:ids])
|
||||
@projects = TechnologyTransfer.any_in(_id: params[:ids])
|
||||
|
||||
@projects.each do |project|
|
||||
project.is_hidden = params[:disable]
|
||||
|
|
|
@ -28,6 +28,8 @@ class PersonalTechnologyTransfersController < ApplicationController
|
|||
t << {"value" => (tt.send("technology_transfer_category").title rescue "")}
|
||||
when "authors"
|
||||
t << {"value" => (tt.send(:member_profile).name rescue "")}
|
||||
when "patent_granted"
|
||||
t << {"value" => (tt.patent_granted ? t("personal_technology_transfer.y_es") : t("personal_technology_transfer.n_o"))}
|
||||
else
|
||||
t << {"value" => (tt.send(fs) rescue "")}
|
||||
end
|
||||
|
|
|
@ -64,6 +64,8 @@ class TechnologyTransfer
|
|||
pd_data << {"data_title" => (p.patent_granted ? "Yes" : "No")}
|
||||
elsif t == "authors"
|
||||
pd_data << {"data_title" => (p.member_profile.name rescue "")}
|
||||
elsif t == "patent_granted"
|
||||
pd_data << {"data_title" => (p.patent_granted ? t("personal_technology_transfer.y_es") : t("personal_technology_transfer.n_o"))}
|
||||
else
|
||||
pd_data << { "data_title" => p.send(t) }
|
||||
end
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<%= stylesheet_link_tag "lib/main-list" %>
|
||||
<% end %>
|
||||
|
||||
<%= form_for(:course_intro, :url => update_frontend_setting_admin_technology_transfers_path, :method => "post", html: {class: "form-horizontal main-forms previewable"} ) do |f| %>
|
||||
<%= form_for(:technology_transfer_intro, :url => update_frontend_setting_admin_technology_transfers_path, :method => "post", html: {class: "form-horizontal main-forms previewable"} ) do |f| %>
|
||||
<fieldset>
|
||||
<!-- Input Area -->
|
||||
<div class="input-area">
|
||||
|
|
|
@ -6,6 +6,8 @@ en:
|
|||
personal_technology_transfer:
|
||||
title: Title
|
||||
year: Year
|
||||
y_es: Yes
|
||||
n_o: No
|
||||
category: Category
|
||||
patent_granted: Patent Granted
|
||||
patent_title: Patent Title
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
zh_tw:
|
||||
zh_tw:
|
||||
module_name:
|
||||
personal_technology_transfer: 技術移轉/授權
|
||||
technology_transfers: 技術移轉/授權
|
||||
|
@ -6,6 +6,8 @@
|
|||
personal_technology_transfer:
|
||||
title: 名稱
|
||||
year: 年度
|
||||
y_es: 是
|
||||
n_o: 否
|
||||
category: 類別
|
||||
patent_granted: 是否取得專利
|
||||
patent_title: 專利名稱
|
||||
|
|
Loading…
Reference in New Issue