desktop research
This commit is contained in:
parent
d257e273a3
commit
34cef75438
|
@ -1,4 +1,5 @@
|
||||||
class Admin::ResearchsController < OrbitMemberController
|
class Admin::ResearchsController < OrbitMemberController
|
||||||
|
include Admin::PersonalResearchesHelper
|
||||||
layout "member_plugin"
|
layout "member_plugin"
|
||||||
|
|
||||||
before_action :set_research, only: [:show, :edit , :update, :destroy]
|
before_action :set_research, only: [:show, :edit , :update, :destroy]
|
||||||
|
@ -15,28 +16,48 @@ class Admin::ResearchsController < OrbitMemberController
|
||||||
def new
|
def new
|
||||||
@member = MemberProfile.find_by(:uid=>params['uid']) rescue nil
|
@member = MemberProfile.find_by(:uid=>params['uid']) rescue nil
|
||||||
@research = Research.new
|
@research = Research.new
|
||||||
|
if params[:desktop]
|
||||||
|
render :layout => false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@member = MemberProfile.find(research_params['member_profile_id']) rescue nil
|
@member = MemberProfile.find(research_params['member_profile_id']) rescue nil
|
||||||
@research = Research.new(research_params)
|
@research = Research.new(research_params)
|
||||||
@research.save
|
@research.save
|
||||||
|
if params[:desktop] == "true"
|
||||||
|
render json: {"data" => get_paper_list}.to_json
|
||||||
|
else
|
||||||
redirect_to params['referer_url']
|
redirect_to params['referer_url']
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@member = @research.member_profile rescue nil
|
@member = @research.member_profile rescue nil
|
||||||
|
if params[:desktop]
|
||||||
|
render :layout => false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@member = @research.member_profile rescue nil
|
@member = @research.member_profile rescue nil
|
||||||
@research.update_attributes(research_params)
|
@research.update_attributes(research_params)
|
||||||
@research.save
|
@research.save
|
||||||
|
if params[:desktop] == "true"
|
||||||
|
render json: {"data" => get_paper_list}.to_json
|
||||||
|
else
|
||||||
redirect_to params['referer_url']
|
redirect_to params['referer_url']
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@research.destroy
|
@research.destroy
|
||||||
|
respond_to do |format|
|
||||||
|
format.html { redirect_to(admin_researchs_url) }
|
||||||
|
# format.xml { head :ok }
|
||||||
|
format.js
|
||||||
|
format.json {render json: {"success" => true}}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def toggle_hide
|
def toggle_hide
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
class Desktop::PersonalResearchesController < DesktopAdminController
|
||||||
|
include Admin::PersonalResearchesHelper
|
||||||
|
|
||||||
|
def menu
|
||||||
|
user = OrbitHelper.current_user
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"title" => "List",
|
||||||
|
"layout" => "list"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title" => "Add/Edit",
|
||||||
|
"layout" => "form",
|
||||||
|
"new_path" => "/admin/members/#{user.member_profile.to_param}/researchs/new"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
def list
|
||||||
|
get_paper_list
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
|
@ -0,0 +1,28 @@
|
||||||
|
module Admin::PersonalResearchesHelper
|
||||||
|
|
||||||
|
def get_paper_list
|
||||||
|
user = current_user.nil? ? OrbitHelper.current_user : current_user
|
||||||
|
user_profile = user.member_profile
|
||||||
|
researchs = Research.where(:member_profile_id => user_profile.id)
|
||||||
|
researchs = researchs.collect do |r|
|
||||||
|
files = r.research_files.collect do |rf|
|
||||||
|
{
|
||||||
|
"title" => rf.title,
|
||||||
|
"description" => rf.description,
|
||||||
|
"link" => rf.file.url,
|
||||||
|
"extension" => (rf.file.url.split(".").last rescue "")
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
{
|
||||||
|
"id" => r.id.to_s,
|
||||||
|
"edit_url" => "/#{I18n.locale.to_s}/admin/members/#{user_profile.to_param}/researchs/#{r.to_param}/edit",
|
||||||
|
"delete_url" => "/#{I18n.locale.to_s}/admin/researchs/#{r.id.to_s}",
|
||||||
|
"paper_title" => r.research_title,
|
||||||
|
"keywords" => r.keywords,
|
||||||
|
"files" => files
|
||||||
|
}
|
||||||
|
end
|
||||||
|
researchs
|
||||||
|
end
|
||||||
|
end
|
|
@ -199,11 +199,9 @@
|
||||||
<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
|
<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% content_for :page_specific_javascript do %>
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$('.main-forms').find('.add-on').tooltip().end().on('click', '.trigger, .delete_file, .remove_existing_record', function() {
|
||||||
$('.main-forms .add-on').tooltip();
|
if($(this).hasClass('trigger')) {
|
||||||
$(document).on('click', '#add_file', function(){
|
|
||||||
var new_id = $(this).prev().attr('value');
|
var new_id = $(this).prev().attr('value');
|
||||||
var old_id = new RegExp("new_research_files", "g");
|
var old_id = new RegExp("new_research_files", "g");
|
||||||
var on = $('.language-nav li.active').index();
|
var on = $('.language-nav li.active').index();
|
||||||
|
@ -213,17 +211,14 @@
|
||||||
$(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.input-append').find('.tab-content').each(function() {
|
$(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.input-append').find('.tab-content').each(function() {
|
||||||
$(this).children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
|
$(this).children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
|
||||||
});
|
});
|
||||||
formTip();
|
$('.add-on').tooltip();
|
||||||
});
|
} else if($(this).hasClass('delete_file')) {
|
||||||
$(document).on('click', '.delete_file', function(){
|
|
||||||
$(this).parents('.input-prepend').remove();
|
$(this).parents('.input-prepend').remove();
|
||||||
});
|
} else if($(this).hasClass('remove_existing_record')) {
|
||||||
$(document).on('click', '.remove_existing_record', function(){
|
|
||||||
if(confirm("<%= I18n.t(:sure?)%>")){
|
if(confirm("<%= I18n.t(:sure?)%>")){
|
||||||
$(this).children('.should_destroy').attr('value', 1);
|
$(this).children('.should_destroy').attr('value', 1);
|
||||||
$(this).parents('.start-line').hide();
|
$(this).parents('.start-line').hide();
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<% end %>
|
|
|
@ -6,6 +6,7 @@ module PersonalResearch
|
||||||
base_url File.expand_path File.dirname(__FILE__)
|
base_url File.expand_path File.dirname(__FILE__)
|
||||||
personal_plugin :enable => true, :sort_number => '20', :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"/plugin/personal_research/profile",:front_path=>"/profile",:admin_path=>"/admin/researchs",:i18n=>'module_name.personal_research', :module_app_name=>"PersonalResearch"
|
personal_plugin :enable => true, :sort_number => '20', :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"/plugin/personal_research/profile",:front_path=>"/profile",:admin_path=>"/admin/researchs",:i18n=>'module_name.personal_research', :module_app_name=>"PersonalResearch"
|
||||||
version "0.1"
|
version "0.1"
|
||||||
|
desktop_enabled true
|
||||||
organization "Rulingcom"
|
organization "Rulingcom"
|
||||||
author "RD dep"
|
author "RD dep"
|
||||||
intro "I am intro"
|
intro "I am intro"
|
||||||
|
|
Loading…
Reference in New Issue