Misc. template cleanup per oruga effort
This commit is contained in:
Lance Edgar
parent
ba32422059
commit
890ec64f3c
|
|
@ -1043,6 +1043,14 @@ class Form(object):
|
|||
if field_type:
|
||||
attrs['type'] = field_type
|
||||
if messages:
|
||||
if len(messages) == 1:
|
||||
msg = messages[0]
|
||||
if msg.startswith('`') and msg.endswith('`'):
|
||||
attrs[':message'] = msg
|
||||
else:
|
||||
attrs['message'] = msg
|
||||
else:
|
||||
# nb. must pass an array as JSON string
|
||||
attrs[':message'] = '[{}]'.format(', '.join([
|
||||
"'{}'".format(msg.replace("'", r"\'"))
|
||||
for msg in messages]))
|
||||
|
|
|
|||
|
|
@ -1374,6 +1374,7 @@ class Grid(object):
|
|||
"""
|
||||
context = dict(kwargs)
|
||||
context['grid'] = self
|
||||
context['request'] = self.request
|
||||
context['data_prop'] = data_prop
|
||||
context['empty_labels'] = empty_labels
|
||||
if 'grid_columns' not in context:
|
||||
|
|
|
|||
|
|
@ -90,6 +90,11 @@ header span.header-text {
|
|||
* "object helper" panel
|
||||
******************************/
|
||||
|
||||
.object-helpers .panel {
|
||||
margin: 1rem;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.object-helpers .panel-heading {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,12 +55,16 @@
|
|||
% if form.auto_disable_save or form.auto_disable:
|
||||
<b-button type="is-primary"
|
||||
native-type="submit"
|
||||
:disabled="${form.component_studly}Submitting">
|
||||
:disabled="${form.component_studly}Submitting"
|
||||
icon-pack="fas"
|
||||
icon-left="save">
|
||||
{{ ${form.component_studly}ButtonText }}
|
||||
</b-button>
|
||||
% else:
|
||||
<b-button type="is-primary"
|
||||
native-type="submit">
|
||||
native-type="submit"
|
||||
icon-pack="fas"
|
||||
icon-left="save">
|
||||
${getattr(form, 'submit_label', getattr(form, 'save_label', "Submit"))}
|
||||
</b-button>
|
||||
% endif
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
<div class="level-item">
|
||||
<b-button type="is-primary"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-plus"
|
||||
icon-left="plus"
|
||||
@click="addColumn()">
|
||||
New Column
|
||||
</b-button>
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
<div class="level-item">
|
||||
<b-button type="is-danger"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-trash"
|
||||
icon-left="trash"
|
||||
@click="new_table.columns = []"
|
||||
:disabled="!new_table.columns.length">
|
||||
Delete All
|
||||
|
|
@ -164,11 +164,13 @@
|
|||
<section class="modal-card-body">
|
||||
|
||||
<b-field label="Name">
|
||||
<b-input v-model="editingColumnName"></b-input>
|
||||
<b-input v-model="editingColumnName"
|
||||
expanded />
|
||||
</b-field>
|
||||
|
||||
<b-field label="Data Type">
|
||||
<b-input v-model="editingColumnDataType"></b-input>
|
||||
<b-input v-model="editingColumnDataType"
|
||||
expanded />
|
||||
</b-field>
|
||||
|
||||
<b-field label="Nullable">
|
||||
|
|
@ -179,7 +181,8 @@
|
|||
</b-field>
|
||||
|
||||
<b-field label="Description">
|
||||
<b-input v-model="editingColumnDescription"></b-input>
|
||||
<b-input v-model="editingColumnDescription"
|
||||
expanded />
|
||||
</b-field>
|
||||
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@
|
|||
<%def name="page_content()">
|
||||
% if project_type:
|
||||
<b-field grouped>
|
||||
<b-field horizontal expanded label="Project Type">
|
||||
<b-field horizontal expanded label="Project Type"
|
||||
class="is-expanded">
|
||||
${project_type}
|
||||
</b-field>
|
||||
<once-button type="is-primary"
|
||||
|
|
|
|||
|
|
@ -76,12 +76,12 @@
|
|||
</b-table-column>
|
||||
% endif
|
||||
|
||||
<template slot="empty">
|
||||
<template #empty>
|
||||
<div class="content has-text-grey has-text-centered">
|
||||
<p>
|
||||
<b-icon
|
||||
pack="fas"
|
||||
icon="fas fa-sad-tear"
|
||||
icon="sad-tear"
|
||||
size="is-large">
|
||||
</b-icon>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@
|
|||
</span>
|
||||
<b-select v-model="perPage"
|
||||
size="is-small"
|
||||
@input="loadAsyncData()">
|
||||
@input="perPageUpdated">
|
||||
% for value in grid.get_pagesize_options():
|
||||
<option value="${value}">${value}</option>
|
||||
% endfor
|
||||
|
|
@ -459,9 +459,11 @@
|
|||
|
||||
if (params === undefined || params === null) {
|
||||
params = new URLSearchParams(this.getBasicParams())
|
||||
} else {
|
||||
params = new URLSearchParams(params)
|
||||
}
|
||||
params.append('partial', true)
|
||||
params = params.toString()
|
||||
}
|
||||
|
||||
this.loading = true
|
||||
this.$http.get(`${'$'}{this.ajaxDataUrl}?${'$'}{params}`).then(({ data }) => {
|
||||
|
|
@ -520,6 +522,12 @@
|
|||
this.loadAsyncData()
|
||||
},
|
||||
|
||||
perPageUpdated(value) {
|
||||
this.loadAsyncData({
|
||||
pagesize: value,
|
||||
})
|
||||
},
|
||||
|
||||
onSort(field, order, event) {
|
||||
|
||||
if (event.ctrlKey) {
|
||||
|
|
|
|||
|
|
@ -77,31 +77,31 @@
|
|||
<b-field label="Key"
|
||||
:type="overnightTaskKey ? null : 'is-danger'">
|
||||
<b-input v-model.trim="overnightTaskKey"
|
||||
ref="overnightTaskKey">
|
||||
</b-input>
|
||||
ref="overnightTaskKey"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Description"
|
||||
:type="overnightTaskDescription ? null : 'is-danger'">
|
||||
<b-input v-model.trim="overnightTaskDescription"
|
||||
ref="overnightTaskDescription">
|
||||
</b-input>
|
||||
ref="overnightTaskDescription"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Module">
|
||||
<b-input v-model.trim="overnightTaskModule">
|
||||
</b-input>
|
||||
<b-input v-model.trim="overnightTaskModule"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Class Name">
|
||||
<b-input v-model.trim="overnightTaskClass">
|
||||
</b-input>
|
||||
<b-input v-model.trim="overnightTaskClass"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Script">
|
||||
<b-input v-model.trim="overnightTaskScript">
|
||||
</b-input>
|
||||
<b-input v-model.trim="overnightTaskScript"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Notes">
|
||||
<b-input v-model.trim="overnightTaskNotes"
|
||||
type="textarea">
|
||||
</b-input>
|
||||
type="textarea"
|
||||
expanded />
|
||||
</b-field>
|
||||
</section>
|
||||
|
||||
|
|
@ -194,19 +194,19 @@
|
|||
<b-field label="Key"
|
||||
:type="backfillTaskKey ? null : 'is-danger'">
|
||||
<b-input v-model.trim="backfillTaskKey"
|
||||
ref="backfillTaskKey">
|
||||
</b-input>
|
||||
ref="backfillTaskKey"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Description"
|
||||
:type="backfillTaskDescription ? null : 'is-danger'">
|
||||
<b-input v-model.trim="backfillTaskDescription"
|
||||
ref="backfillTaskDescription">
|
||||
</b-input>
|
||||
ref="backfillTaskDescription"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Script"
|
||||
:type="backfillTaskScript ? null : 'is-danger'">
|
||||
<b-input v-model.trim="backfillTaskScript">
|
||||
</b-input>
|
||||
<b-input v-model.trim="backfillTaskScript"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field grouped>
|
||||
<b-field label="Orientation">
|
||||
|
|
@ -222,8 +222,8 @@
|
|||
</b-field>
|
||||
<b-field label="Notes">
|
||||
<b-input v-model.trim="backfillTaskNotes"
|
||||
type="textarea">
|
||||
</b-input>
|
||||
type="textarea"
|
||||
expanded />
|
||||
</b-field>
|
||||
</section>
|
||||
|
||||
|
|
@ -252,7 +252,8 @@
|
|||
expanded>
|
||||
<b-input name="rattail.luigi.url"
|
||||
v-model="simpleSettings['rattail.luigi.url']"
|
||||
@input="settingsNeedSaved = true">
|
||||
@input="settingsNeedSaved = true"
|
||||
expanded>
|
||||
</b-input>
|
||||
</b-field>
|
||||
|
||||
|
|
@ -261,7 +262,8 @@
|
|||
expanded>
|
||||
<b-input name="rattail.luigi.scheduler.supervisor_process_name"
|
||||
v-model="simpleSettings['rattail.luigi.scheduler.supervisor_process_name']"
|
||||
@input="settingsNeedSaved = true">
|
||||
@input="settingsNeedSaved = true"
|
||||
expanded>
|
||||
</b-input>
|
||||
</b-field>
|
||||
|
||||
|
|
@ -270,7 +272,8 @@
|
|||
expanded>
|
||||
<b-input name="rattail.luigi.scheduler.restart_command"
|
||||
v-model="simpleSettings['rattail.luigi.scheduler.restart_command']"
|
||||
@input="settingsNeedSaved = true">
|
||||
@input="settingsNeedSaved = true"
|
||||
expanded>
|
||||
</b-input>
|
||||
</b-field>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,10 +10,9 @@
|
|||
<%def name="render_instance_header_title_extras()">
|
||||
% if master.touchable and master.has_perm('touch'):
|
||||
<b-button title=""Touch" this record to trigger sync"
|
||||
icon-pack="fas"
|
||||
icon-left="hand-pointer"
|
||||
@click="touchRecord()"
|
||||
:disabled="touchSubmitting">
|
||||
<span><i class="fa fa-hand-pointer"></i></span>
|
||||
</b-button>
|
||||
% endif
|
||||
% if expose_versions:
|
||||
|
|
@ -34,7 +33,7 @@
|
|||
% if xref_buttons or xref_links:
|
||||
<nav class="panel">
|
||||
<p class="panel-heading">Cross-Reference</p>
|
||||
<div class="panel-block buttons">
|
||||
<div class="panel-block">
|
||||
<div style="display: flex; flex-direction: column; gap: 0.5rem;">
|
||||
% for button in xref_buttons:
|
||||
${button}
|
||||
|
|
|
|||
|
|
@ -19,40 +19,32 @@
|
|||
</%def>
|
||||
|
||||
<%def name="page_content()">
|
||||
## TODO: this was basically copied from Revel diff template..need to abstract
|
||||
|
||||
<div class="form-wrapper">
|
||||
|
||||
<div class="form-wrapper" style="margin: 1rem; 0;">
|
||||
<div class="form">
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label>Changed</label>
|
||||
<div class="field">${h.pretty_datetime(request.rattail_config, changed)}</div>
|
||||
</div>
|
||||
<b-field label="Changed" horizontal>
|
||||
<span>${h.pretty_datetime(request.rattail_config, changed)}</span>
|
||||
</b-field>
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label>Changed by</label>
|
||||
<div class="field">${transaction.user or ''}</div>
|
||||
</div>
|
||||
<b-field label="Changed by" horizontal>
|
||||
<span>${transaction.user or ''}</span>
|
||||
</b-field>
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label>IP Address</label>
|
||||
<div class="field">${transaction.remote_addr}</div>
|
||||
</div>
|
||||
<b-field label="IP Address" horizontal>
|
||||
<span>${transaction.remote_addr}</span>
|
||||
</b-field>
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label>Comment</label>
|
||||
<div class="field">${transaction.meta.get('comment') or ''}</div>
|
||||
</div>
|
||||
<b-field label="Comment" horizontal>
|
||||
<span>${transaction.meta.get('comment') or ''}</span>
|
||||
</b-field>
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label>TXN ID</label>
|
||||
<div class="field">${transaction.id}</div>
|
||||
</div>
|
||||
<b-field label="TXN ID" horizontal>
|
||||
<span>${transaction.id}</span>
|
||||
</b-field>
|
||||
|
||||
</div>
|
||||
|
||||
</div><!-- form-wrapper -->
|
||||
</div>
|
||||
|
||||
<div class="versions-wrapper">
|
||||
% for diff in version_diffs:
|
||||
|
|
@ -60,7 +52,6 @@
|
|||
${diff.render_html()}
|
||||
% endfor
|
||||
</div>
|
||||
|
||||
</%def>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,13 @@
|
|||
hidden: row.hidden == 'No' ? true : false,
|
||||
}
|
||||
this.submitForm(url, params, response => {
|
||||
row.hidden = params.hidden ? 'Yes' : 'No'
|
||||
// must update "original" data row, since our row arg
|
||||
// may just be a proxy and not trigger view refresh
|
||||
for (let email of this.data) {
|
||||
if (email.key == row.key) {
|
||||
email.hidden = params.hidden ? 'Yes' : 'No'
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -66,21 +66,21 @@
|
|||
:type="upgradeSystemKey ? null : 'is-danger'">
|
||||
<b-input v-model.trim="upgradeSystemKey"
|
||||
ref="upgradeSystemKey"
|
||||
:disabled="upgradeSystemKey == 'rattail'">
|
||||
</b-input>
|
||||
:disabled="upgradeSystemKey == 'rattail'"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Label"
|
||||
:type="upgradeSystemLabel ? null : 'is-danger'">
|
||||
<b-input v-model.trim="upgradeSystemLabel"
|
||||
ref="upgradeSystemLabel"
|
||||
:disabled="upgradeSystemKey == 'rattail'">
|
||||
</b-input>
|
||||
:disabled="upgradeSystemKey == 'rattail'"
|
||||
expanded />
|
||||
</b-field>
|
||||
<b-field label="Command"
|
||||
:type="upgradeSystemCommand ? null : 'is-danger'">
|
||||
<b-input v-model.trim="upgradeSystemCommand"
|
||||
ref="upgradeSystemCommand">
|
||||
</b-input>
|
||||
ref="upgradeSystemCommand"
|
||||
expanded />
|
||||
</b-field>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
<b-field label="Description"
|
||||
:type="{'is-danger': !apiNewTokenDescription}">
|
||||
<b-input v-model.trim="apiNewTokenDescription"
|
||||
expanded
|
||||
ref="apiNewTokenDescription">
|
||||
</b-input>
|
||||
</b-field>
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ def includeme(config):
|
|||
${parent.modify_this_page_vars()}
|
||||
<script type="text/javascript">
|
||||
|
||||
ThisPageData.activeStep = null
|
||||
ThisPageData.activeStep = 'enter-details'
|
||||
|
||||
ThisPageData.modelNames = ${json.dumps(model_names)|n}
|
||||
ThisPageData.modelName = null
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ def get_form_data(request):
|
|||
# TODO: this seems to work for our use case at least, but perhaps
|
||||
# there is a better way? see also
|
||||
# https://docs.pylonsproject.org/projects/pyramid/en/latest/api/request.html#pyramid.request.Request.is_xhr
|
||||
if request.is_xhr and not request.POST:
|
||||
if (request.is_xhr or request.content_type == 'application/json') and not request.POST:
|
||||
return request.json_body
|
||||
return request.POST
|
||||
|
||||
|
|
|
|||
|
|
@ -187,7 +187,8 @@ class CommonView(View):
|
|||
data['client_ip'] = self.request.client_addr
|
||||
app.send_email('user_feedback', data=data)
|
||||
return {'ok': True}
|
||||
return {'error': "Form did not validate!"}
|
||||
dform = form.make_deform_form()
|
||||
return {'error': str(dform.error)}
|
||||
|
||||
def consume_batch_id(self):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -249,6 +249,7 @@ class RoleView(PrincipalMasterView):
|
|||
factory = self.get_grid_factory()
|
||||
g = factory(
|
||||
key='{}.users'.format(route_prefix),
|
||||
request=self.request,
|
||||
data=[],
|
||||
columns=[
|
||||
'full_name',
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ class UserView(PrincipalMasterView):
|
|||
"""
|
||||
model_class = User
|
||||
has_rows = True
|
||||
rows_title = "User Events"
|
||||
model_row_class = UserEvent
|
||||
has_versions = True
|
||||
touchable = True
|
||||
|
|
@ -225,7 +226,7 @@ class UserView(PrincipalMasterView):
|
|||
# f.set_required('password')
|
||||
|
||||
# api_tokens
|
||||
if self.creating or self.editing:
|
||||
if self.creating or self.editing or self.deleting:
|
||||
f.remove('api_tokens')
|
||||
elif self.has_perm('manage_api_tokens'):
|
||||
f.set_renderer('api_tokens', self.render_api_tokens)
|
||||
|
|
@ -283,6 +284,7 @@ class UserView(PrincipalMasterView):
|
|||
|
||||
factory = self.get_grid_factory()
|
||||
g = factory(
|
||||
request=self.request,
|
||||
key='{}.api_tokens'.format(route_prefix),
|
||||
data=[],
|
||||
columns=['description', 'created'],
|
||||
|
|
|
|||
Loading…
Reference in a new issue