diff --git a/app/models/writing_conference.rb b/app/models/writing_conference.rb index 8b5ab9e..a31f990 100644 --- a/app/models/writing_conference.rb +++ b/app/models/writing_conference.rb @@ -91,6 +91,8 @@ class WritingConference if !self.publication_date.nil? pd = self.publication_date.strftime("%Y-%m-%d").split('-') title << pd[0] + elsif !self.year.blank? + title << self.year end title << self.paper_title if self.paper_title.present? diff --git a/app/views/panel/personal_conference/plugin/_profile.html.erb b/app/views/panel/personal_conference/plugin/_profile.html.erb index 787ba0f..ed514b3 100644 --- a/app/views/panel/personal_conference/plugin/_profile.html.erb +++ b/app/views/panel/personal_conference/plugin/_profile.html.erb @@ -75,8 +75,9 @@ <% if is_admin? %>
- <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> - <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %> + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_conference_data_path(:user_id => @user.id), :class => 'btn btn-primary' %> + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>