developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP 

* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  small fix for journal_pages desktop
This commit is contained in:
Rueshyna 2012-11-21 17:12:22 +08:00
parent b4e058e557 c94940214c
commit 24bb56416e
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/desktop/journal_pages.js.erb
View File

@ -207,8 +207,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
}
bindHandlers();
}
this.initializeJournalPapers.coAuthorformCallback = function(ruse){
this.initializeJournalPapers.formCallback = function(data){
this.initializeJournalPapers.coAuthorformCallback = function(data){
if(data.success){
o.notify(data.msg,"success");
o.sub_menu_item($("div[content-type=menu] a").eq(0));
@ -216,7 +215,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
o.notify(data.msg,"alert");
}
}
}
this.initializeJournalPapers.coauthor = function(){ // to open add pages in journal papers page
var bindHandlers = function(){ // to bind handlers for add page
o.simple_drop_down();

2
app/assets/javascripts/orbitdesktop.js
View File

@ -133,7 +133,7 @@ var orbitDesktop = function(dom){
}
},'*[content-type=menu] a');
$("body").on("submit","form[type=ajax_form]",function(){
$("body").on("submit","form[form-type=ajax_form]",function(){
var callback_method = $(this).attr("callback-method");
var options = {
success:function(responseText, statusText, xhr, $form){

4
app/controllers/desktop/journal_pages_controller.rb
View File

@ -35,7 +35,7 @@ class Desktop::JournalPagesController < ApplicationController
end
def create
if params[:commit].eql?"Save"
params[:writing_journal][:create_user_id] = current_user.id
@writing_journal = WritingJournal.new(params[:writing_journal])
@ -46,7 +46,7 @@ class Desktop::JournalPagesController < ApplicationController
format.json {render json: {success: false, msg: "Saving failed!"}.to_json }
end
end
end
end
def update

2
app/views/desktop/journal_pages/edit.html.erb
View File

@ -1,3 +1,3 @@
<%= form_for @writing_journal, url: desktop_journal_page_path(@writing_journal),html: { multipart: true ,:type=>"ajax_form", "callback-method"=>"formCallback"} do |f| %>
<%= form_for @writing_journal, url: desktop_journal_page_path(@writing_journal),html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"formCallback"} do |f| %>
<%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
<%end%>

2
app/views/desktop/journal_pages/new.html.erb
View File

@ -1,3 +1,3 @@
<%= form_for @writing_journal, html: { multipart: true, :type=>"ajax_form", "callback-method"=>"formCallback"} , url: desktop_journal_pages_path do |f| %>
<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"} , url: desktop_journal_pages_path do |f| %>
<%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
<%end%>