erictyl
/
personal-diploma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for frontend

This commit is contained in:
Harry Bomrah 2014-10-03 14:12:35 +08:00
parent 1fcae46912
commit 456a9da33a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/personal_diplomas_controller.rb
View File

@ -3,7 +3,7 @@ class PersonalDiplomasController < ApplicationController
diplomas = Diploma.where(:is_hidden=>false).order_by(:end_date=>'desc', :start_date=>'desc').page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) diplomas = Diploma.where(:is_hidden=>false).order_by(:end_date=>'desc', :start_date=>'desc').page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
diploma_list = diplomas.collect do |diploma| diploma_list = diplomas.collect do |diploma|
{ {
"member" => diploma.member_profile.name, "member" => (diploma.member_profile.name rescue ""),
"duration" => diploma.duration, "duration" => diploma.duration,
"school_name" => diploma.school_name, "school_name" => diploma.school_name,
"degree" => diploma.degree, "degree" => diploma.degree,

2
app/models/diploma.rb
View File

@ -40,7 +40,7 @@ class Diploma
def get_plugin_data(fields_to_show) def get_plugin_data(fields_to_show)
plugin_datas = [] plugin_datas = []
fields_to_show.each do |field| fields_to_show.each do |field|
plugin_data = self.get_plugin_field_data(field) plugin_data = self.get_plugin_field_data(field) rescue nil
next if plugin_data.blank? or plugin_data['value'].blank? next if plugin_data.blank? or plugin_data['value'].blank?
plugin_datas << plugin_data plugin_datas << plugin_data
end end