Archived
added sync for journal paper books and conference.. and also disabled the icons
Conflicts: app/assets/javascripts/desktop/orbitdesktop.js app/controllers/admin/import_data_controller.rb Conflicts: vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
This commit is contained in:
1 parent
671257992a
commit
774cc5d392
9 files changed
+36
-21
No files matched your search
@@ -322,8 +322,12 @@ def sync_conference_data
|
||||
puts "No conference by Teacher"
|
||||
end
|
||||
end
|
||||
respond_to do |format|
|
||||
|
||||
format.html { redirect_to request.referer }
|
||||
format.json { render json: {"success"=>true}.to_json}
|
||||
|
||||
redirect_to request.referer
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -509,6 +513,13 @@ end
|
||||
else
|
||||
puts "No conference by Teacher"
|
||||
end
|
||||
|
||||
end
|
||||
respond_to do |format|
|
||||
|
||||
format.html
|
||||
format.json { render json: {"success"=>true}.to_json}
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -631,6 +642,12 @@ def sync_book_data_auto
|
||||
end
|
||||
end
|
||||
end
|
||||
respond_to do |format|
|
||||
|
||||
format.html
|
||||
format.json { render json: {"success"=>true}.to_json}
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user