Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix #50 #73

Merged
merged 1 commit into from

2 participants

@Borkason
Collaborator

Further, I improved the wizard to show the "Deployment method" on page two, regardless of whether "spawn-fcgi" is available. That way people know they might have more options if it is availabl.

@skinkie skinkie merged commit 8f51b15 into cherokee:master
@Borkason Borkason deleted the unknown repository branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 3, 2013
  1. @Borkason

    Fix #50

    Borkason authored
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 6 deletions.
  1. +2 −6 admin/wizards/rails.py
View
8 admin/wizards/rails.py
@@ -367,7 +367,7 @@ def _fcgi_ok (self):
class LocalSource:
def __call__ (self):
# Trim deployment options if needed
- if not path_find_binary (DEFAULT_BINS):
+ if not path_find_binary (DEFAULT_BINS) and len(RAILS_METHOD) == 2:
RAILS_METHOD.remove(('fcgi', 'FastCGI'))
submit = CTK.Submitter (URL_APPLY)
@@ -376,11 +376,7 @@ def __call__ (self):
table.Add (_('Project Directory'), CTK.TextCfg ('%s!ror_dir'%(PREFIX), False), _(NOTE_ROR_DIR))
table.Add (_('RAILS_ENV environment'), CTK.ComboCfg ('%s!ror_env'%(PREFIX), trans_options(RAILS_ENV), {'class': 'noauto'}), _(NOTE_ENV))
-
- if len(RAILS_METHOD) > 1:
- table.Add (_('Deployment method'), CTK.ComboCfg ('%s!ror_method'%(PREFIX), trans_options(RAILS_METHOD), {'class': 'noauto'}), _(NOTE_METHOD))
- else:
- submit += CTK.Hidden('%s!ror_method'%(PREFIX), RAILS_METHOD[0][0])
+ table.Add (_('Deployment method'), CTK.ComboCfg ('%s!ror_method'%(PREFIX), trans_options(RAILS_METHOD), {'class': 'noauto'}), _(NOTE_METHOD))
cont = CTK.Container()
cont += CTK.RawHTML ('<h2>%s</h2>' %(_(NOTE_LOCAL_H1)))
Something went wrong with that request. Please try again.