bit-badger/myWebLog
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 11 Activity

Version 2.1 #41

Merged
danieljsummers merged 123 commits from version-2.1 into main 2024-03-27 00:13:28 +00:00
Conversation 0 Commits 123 Files Changed 116 +16 -7
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79c304493c - Show all commits

6
src/MyWebLog/Maintenance.fs
View File

@ -384,7 +384,11 @@ module Backup =
// Restore web log data
printfn "- Restoring web log..."
do! data.WebLog.Add restore.WebLog
// v2.0 backups will not have redirect rules; fix that if restoring to v2.1 or later
let webLog =
if isNull (box restore.WebLog.RedirectRules) then { restore.WebLog with RedirectRules = [] }
else restore.WebLog
do! data.WebLog.Add webLog
printfn "- Restoring users..."
do! data.WebLogUser.Restore restore.Users

17
src/admin-theme/redirect-list.liquid
View File

@ -18,9 +18,9 @@
{% if redir_count > 0 -%}
<div class="container">
<div class="row mwl-table-heading">
<div class="col">From</div>
<div class="col">To</div>
<div class="col">RegEx?</div>
<div class="col-5">From</div>
<div class="col-5">To</div>
<div class="col-2 text-center">RegEx?</div>
</div>
</div>
<div class="row mwl-table-detail" id="redir_new"></div>
@ -29,7 +29,7 @@
{% for redir in redirections -%}
{%- assign redir_id = "redir_" | append: forloop.index0 -%}
<div class="row mwl-table-detail" id="{{ redir_id }}">
<div class="col no-wrap">
<div class="col-5 no-wrap">
{{ redir.from }}<br>
<small>
{%- assign redir_url = "admin/settings/redirect-rules/" | append: forloop.index0 -%}
@ -55,8 +55,8 @@
</a>
</small>
</div>
<div class="col">{{ redir.to }}</div>
<div class="col">{% if redir.is_regex %}Yes{% else %}No{% endif %}</div>
<div class="col-5">{{ redir.to }}</div>
<div class="col-2 text-center">{% if redir.is_regex %}Yes{% else %}No{% endif %}</div>
</div>
{%- endfor %}
</form>
@ -68,4 +68,9 @@
</div>
</div>
</div>
<p class="mt-3 text-muted fst-italic text-center">
This is an advanced feature; please
<a href="https://bitbadger.solutions/open-source/myweblog/advanced.html#redirect-rules"
target="_blank">read and understand the documentation on this feature</a> before adding rules.
</p>
</article>