rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix config file priority for display, and batch subprocess commands

Browse source
This commit is contained in:
Lance Edgar 2023-10-24 09:53:40 -05:00
parent 549976dcfb
commit 72e4daafc1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tailbone/templates/appinfo/index.mako
View file

@ -51,7 +51,7 @@
</b-icon> </b-icon>
</span> </span>
<strong>Configuration Files</strong> <span>Configuration Files (style: ${request.rattail_config._style})</span>
</div> </div>
</template> </template>
@ -116,7 +116,7 @@
${parent.modify_this_page_vars()} ${parent.modify_this_page_vars()}
<script type="text/javascript"> <script type="text/javascript">
ThisPageData.configFiles = ${json.dumps([dict(path=p, priority=i) for i, p in enumerate(reversed(request.rattail_config.files_read), 1)])|n} ThisPageData.configFiles = ${json.dumps([dict(path=p, priority=i) for i, p in enumerate(request.rattail_config.prioritized_files, 1)])|n}
</script> </script>
</%def> </%def>

2
tailbone/views/batch/core.py
View file

@ -931,7 +931,7 @@ class BatchMasterView(MasterView):
prefix = self.rattail_config.get('rattail', 'command_prefix', prefix = self.rattail_config.get('rattail', 'command_prefix',
default=sys.prefix) default=sys.prefix)
cmd = [os.path.join(prefix, 'bin/{}'.format(command))] cmd = [os.path.join(prefix, 'bin/{}'.format(command))]
for path in reversed(self.rattail_config.files_read): for path in self.rattail_config.prioritized_files:
cmd.extend(['--config', path]) cmd.extend(['--config', path])
if username: if username:
cmd.extend(['--runas', username]) cmd.extend(['--runas', username])