Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-06 07:51:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.3_branch' into master

Browse source
This commit is contained in:
Dan Rice 2015-01-02 21:25:34 -05:00
commit 70191af76b
19 changed files with 3 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/integrations_controller.rb
View file

@ -12,18 +12,6 @@ class IntegrationsController < ApplicationController
@page_title = 'TRACKS::REST API Documentation'
end
def get_quicksilver_applescript
get_applescript('quicksilver_applescript')
end
def get_applescript1
get_applescript('applescript1')
end
def get_applescript2
get_applescript('applescript2')
end
def search_plugin
@icon_data = [File.open(File.join(Rails.root, 'app', 'assets', 'images', 'done.png')).read].
pack('m').gsub(/\n/, '')
@ -72,9 +60,5 @@ class IntegrationsController < ApplicationController
return result
end
def get_applescript(partial_name)
context = current_user.contexts.find params[:context_id]
render :partial => partial_name, :locals => { :context => context }
end
end