Fix some Salt stuff and omit_code option in API.
parent
9d97a697a0
commit
efbddec783
|
@ -1,5 +1,5 @@
|
||||||
base:
|
base:
|
||||||
'local.snipt.net':
|
|
||||||
- vagrant
|
|
||||||
'*':
|
'*':
|
||||||
- production
|
- production
|
||||||
|
'local.snipt.net':
|
||||||
|
- vagrant
|
||||||
|
|
|
@ -33,6 +33,7 @@ virtualenvwrapper:
|
||||||
|
|
||||||
git.latest:
|
git.latest:
|
||||||
- name: https://github.com/nicksergeant/snipt.git
|
- name: https://github.com/nicksergeant/snipt.git
|
||||||
|
- rev: master
|
||||||
- target: /var/www/snipt
|
- target: /var/www/snipt
|
||||||
- user: deploy
|
- user: deploy
|
||||||
|
|
||||||
|
|
|
@ -89,12 +89,12 @@ end
|
||||||
# Virtualenv {{{
|
# Virtualenv {{{
|
||||||
|
|
||||||
set -x WORKON_HOME '/var/www/.virtualenvs'
|
set -x WORKON_HOME '/var/www/.virtualenvs'
|
||||||
source ~/.config/fish/virtualenv.fish
|
. ~/.config/fish/virtualenv.fish
|
||||||
|
|
||||||
# }}}
|
# }}}
|
||||||
# Z {{{
|
# Z {{{
|
||||||
|
|
||||||
source /etc/z.fish
|
. /etc/z.fish
|
||||||
|
|
||||||
function j
|
function j
|
||||||
z $argv
|
z $argv
|
||||||
|
|
|
@ -222,6 +222,10 @@ class PublicSniptResource(ModelResource):
|
||||||
bundle.data['raw_url'] = bundle.obj.get_raw_url()
|
bundle.data['raw_url'] = bundle.obj.get_raw_url()
|
||||||
bundle.data['full_absolute_url'] = bundle.obj.get_full_absolute_url()
|
bundle.data['full_absolute_url'] = bundle.obj.get_full_absolute_url()
|
||||||
bundle.data['description_rendered'] = linebreaksbr(urlize(bundle.obj.description))
|
bundle.data['description_rendered'] = linebreaksbr(urlize(bundle.obj.description))
|
||||||
|
|
||||||
|
if 'omit_code' in bundle.request.GET:
|
||||||
|
del bundle.data['code']
|
||||||
|
|
||||||
return bundle
|
return bundle
|
||||||
|
|
||||||
def build_filters(self, filters=None):
|
def build_filters(self, filters=None):
|
||||||
|
|
Loading…
Reference in New Issue