Skip to content
Browse files

Merge pull request #73 from Borkason/fix-#50

Thanks Borkason for this very elegant fix for Issue #50
  • Loading branch information...
2 parents ef762c3 + 3a63b58 commit 8f51b15029c1f7db80019219bf6e2cc74bf52f7b @skinkie skinkie committed Feb 3, 2013
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)))

0 comments on commit 8f51b15

Please sign in to comment.
Something went wrong with that request. Please try again.