Compare commits
No commits in common. "df043b939e4e802bcee7ef0c5cb78f114b05f6c4" and "366158b698d8a4b5b3208f35f6fa6f6dc98421d7" have entirely different histories.
df043b939e
...
366158b698
6 changed files with 17 additions and 12 deletions
|
|
@ -34,10 +34,9 @@ class PetsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def destination
|
def destination
|
||||||
if request.get?
|
case (params[:destination] || params[:origin])
|
||||||
wardrobe_path
|
when 'wardrobe' then wardrobe_path
|
||||||
else
|
else root_path
|
||||||
root_path
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -60,7 +59,7 @@ class PetsController < ApplicationController
|
||||||
path += "?name=#{params[:name]}"
|
path += "?name=#{params[:name]}"
|
||||||
redirect_to path, :alert => options[:long_message]
|
redirect_to path, :alert => options[:long_message]
|
||||||
end
|
end
|
||||||
|
|
||||||
format.json do
|
format.json do
|
||||||
render :json => options[:long_message], :status => options[:status]
|
render :json => options[:long_message], :status => options[:status]
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ module ApplicationHelper
|
||||||
def origin_tag(value)
|
def origin_tag(value)
|
||||||
hidden_field_tag 'origin', value, :id => nil
|
hidden_field_tag 'origin', value, :id => nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def open_graph(properties)
|
def open_graph(properties)
|
||||||
if @open_graph
|
if @open_graph
|
||||||
@open_graph.merge! properties
|
@open_graph.merge! properties
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,8 @@
|
||||||
module OutfitsHelper
|
module OutfitsHelper
|
||||||
|
def destination_tag(value)
|
||||||
|
hidden_field_tag 'destination', value, :id => nil
|
||||||
|
end
|
||||||
|
|
||||||
def latest_contribution_description(contribution)
|
def latest_contribution_description(contribution)
|
||||||
user = contribution.user
|
user = contribution.user
|
||||||
contributed = contribution.contributed
|
contributed = contribution.contributed
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,8 @@
|
||||||
%h1= t 'app_name'
|
%h1= t 'app_name'
|
||||||
%h2= t '.tagline'
|
%h2= t '.tagline'
|
||||||
|
|
||||||
= form_tag load_pet_path, method: 'GET', class: 'primary load-pet-to-wardrobe' do
|
= form_tag load_pet_path, method: 'POST', class: 'primary load-pet-to-wardrobe' do
|
||||||
|
= hidden_field_tag 'destination', 'wardrobe'
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend= t '.load_pet'
|
%legend= t '.load_pet'
|
||||||
= pet_name_tag class: 'main-pet-name'
|
= pet_name_tag class: 'main-pet-name'
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ OpenneoImpressItems::Application.routes.draw do
|
||||||
get '/alt-styles', to: redirect('/rainbow-pool/styles')
|
get '/alt-styles', to: redirect('/rainbow-pool/styles')
|
||||||
|
|
||||||
# Loading and modeling pets!
|
# Loading and modeling pets!
|
||||||
match '/pets/load' => 'pets#load', :as => :load_pet, via: [:get, :post]
|
post '/pets/load' => 'pets#load', :as => :load_pet
|
||||||
get '/modeling' => 'pets#bulk', :as => :bulk_pets
|
get '/modeling' => 'pets#bulk', :as => :bulk_pets
|
||||||
|
|
||||||
# Contributions to our modeling database!
|
# Contributions to our modeling database!
|
||||||
|
|
|
||||||
|
|
@ -442,12 +442,13 @@
|
||||||
mode: "755"
|
mode: "755"
|
||||||
state: directory
|
state: directory
|
||||||
|
|
||||||
- name: Create 2min cron job to run `rails items:auto_model`
|
- name: Remove 10min cron job to run `rails nc_mall:sync`
|
||||||
become_user: impress
|
become_user: impress
|
||||||
cron:
|
cron:
|
||||||
name: "Impress: auto-model items"
|
state: absent
|
||||||
minute: "*/2"
|
name: "Impress: sync NC Mall data"
|
||||||
job: "bash -c 'source /etc/profile && source ~/.bash_profile && cd /srv/impress/current && bin/rails items:auto_model'"
|
minute: "*/10"
|
||||||
|
job: "bash -c 'source /etc/profile && source ~/.bash_profile && cd /srv/impress/current && bin/rails nc_mall:sync'"
|
||||||
|
|
||||||
- name: Create 10min cron job to run `rails neopets:import`
|
- name: Create 10min cron job to run `rails neopets:import`
|
||||||
become_user: impress
|
become_user: impress
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue