many improvements from Vladyslav

This commit is contained in:
mdipierro
2012-07-14 22:45:32 -05:00
parent 709038cc0a
commit 1b34f47ec9
14 changed files with 63 additions and 47 deletions
+1 -1
View File
@@ -197,7 +197,7 @@ def select():
_name='update_fields', _value=request.vars.update_fields
or '')), TR(T('Delete:'), INPUT(_name='delete_check',
_class='delete', _type='checkbox', value=False), ''),
TR('', '', INPUT(_type='submit', _value='submit'))),
TR('', '', INPUT(_type='submit', _value=T('submit')))),
_action=URL(r=request,args=request.args))
if request.vars.csvfile != None:
try:
+2 -2
View File
@@ -42,7 +42,7 @@ def commit():
path = apath(app, r=request)
repo = hg_repo(path)
form = FORM('Comment:',INPUT(_name='comment',requires=IS_NOT_EMPTY()),
INPUT(_type='submit',_value='Commit'))
INPUT(_type='submit',_value=T('Commit')))
if form.accepts(request.vars,session):
oldid = repo[repo.lookup('.')]
addremove(repo)
@@ -69,7 +69,7 @@ def revision():
repo = hg_repo(path)
revision = request.args(1)
ctx=repo.changectx(revision)
form=FORM(INPUT(_type='submit',_value='revert'))
form=FORM(INPUT(_type='submit',_value=T('Revert')))
if form.accepts(request.vars):
hg.update(repo, revision)
session.flash = "reverted to revision %s" % ctx.rev()
+3 -3
View File
@@ -3,15 +3,15 @@ from distutils import dir_util
try:
from git import *
except ImportError:
session.flash = 'requires python-git, but not installed'
session.flash = T('requires python-git, but not installed')
redirect(URL('default','site'))
def deploy():
apps = sorted(file for file in os.listdir(apath(r=request)))
form = SQLFORM.factory(
Field('osrepo',default='/tmp',label='Path to local openshift repo root.',
Field('osrepo',default='/tmp',label=T('Path to local openshift repo root.'),
requires=EXISTS(error_message=T('directory not found'))),
Field('osname',default='web2py',label='WSGI reference name'),
Field('osname',default='web2py',label=T('WSGI reference name')),
Field('applications','list:string',
requires=IS_IN_SET(apps,multiple=True),
label=T('web2py apps to deploy')))