Skip to content

Commit 472e3ea

Browse files
authored
Merge pull request #114 from cmason3/dev
Dev
2 parents 0cf9368 + b0cad63 commit 472e3ea

File tree

4 files changed

+194
-26
lines changed

4 files changed

+194
-26
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## CHANGELOG
22

3+
### [26.2.0] - January 13, 2026
4+
- Added the ability to selectively hide `data.csv` and `template.j2`
5+
36
### [26.1.1] - January 12, 2026
47
- Fixed an issue with error handling for `jinjafx_schema`
58

@@ -510,6 +513,7 @@
510513
- Initial release
511514

512515

516+
[26.2.0]: https://github.com/cmason3/jinjafx_server/compare/26.1.1...26.2.0
513517
[26.1.1]: https://github.com/cmason3/jinjafx_server/compare/26.1.0...26.1.1
514518
[26.1.0]: https://github.com/cmason3/jinjafx_server/compare/25.9.3...26.1.0
515519
[25.9.3]: https://github.com/cmason3/jinjafx_server/compare/25.9.2...25.9.3

jinjafx_server/jinjafx_server.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess
2929
import cmarkgfm, emoji, jsonschema
3030

31-
__version__ = '26.1.1'
31+
__version__ = '26.2.0'
3232

3333
llock = threading.RLock()
3434
rlock = threading.RLock()
@@ -806,10 +806,18 @@ def authenticate_dt(rdt, r):
806806
dt_yml += '\n'
807807

808808
dt_yml += 'revision: ' + str(dt_revision) + '\n'
809-
dt_yml += 'dataset: "' + dt['dataset'] + '"\n'
809+
810+
if 'dataset' in dt:
811+
dt_yml += 'dataset: "' + dt['dataset'] + '"\n'
810812

811813
if 'show_global' in dt:
812814
dt_yml += 'show_global: ' + dt['show_global'] + '\n'
815+
816+
if 'show_data' in dt:
817+
dt_yml += 'show_data: ' + dt['show_data'] + '\n'
818+
819+
if 'show_template' in dt:
820+
dt_yml += 'show_template: ' + dt['show_template'] + '\n'
813821

814822
if dt_encrypted:
815823
dt_yml += 'encrypted: 1\n'

jinjafx_server/www/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h5 id="title">
3737
<div id="buttons" class="btn-toolbar ms-auto d-flex d-none" role="group">
3838
<div class="btn-group me-2">
3939
<div class="btn-group">
40-
<button id="select_ds" type="button" class="btn btn-warning text-black text-start mw-150 btn-warn-opaque" data-bs-toggle="dropdown" title="Select DataSet" disabled>
40+
<button id="select_ds" type="button" class="btn btn-warning text-black text-start mw-150 btn-warn-opaque" data-bs-toggle="dropdown" title="Select DataSet">
4141
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
4242
<polygon points="12 2 2 7 12 12 22 7 12 2" />
4343
<polyline points="2 17 12 22 22 17" />
@@ -429,6 +429,6 @@ <h4 id="ml-title" class="mt-0">Add Template</h4>
429429
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js" integrity="sha512-CSBhVREyzHAjAFfBlIBakjoRUKp5h7VSweP0InR/pAJyptH7peuhCsqAI/snV+TwZmXZqoUklpXp6R6wMnYf5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
430430
<script src="https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.18/dayjs.min.js" integrity="sha512-FwNWaxyfy2XlEINoSnZh1JQ5TRRtGow0D6XcmAWmYCRgvqOUTnzCxPc9uF35u5ZEpirk1uhlPVA19tflhvnW1g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
431431
<script src="https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.18/plugin/relativeTime.min.js" integrity="sha512-MVzDPmm7QZ8PhEiqJXKz/zw2HJuv61waxb8XXuZMMs9b+an3LoqOqhOEt5Nq3LY1e4Ipbbd/e+AWgERdHlVgaA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
432-
<script src="/69a2cea7/jinjafx_m.js"></script>
432+
<script src="/4e7f41d8/jinjafx_m.js"></script>
433433
</body>
434434
</html>

0 commit comments

Comments
 (0)