cleaned up some template issues and fixed an issue with open-ended ranges in the go box on posts display
This commit is contained in:
+11
-5
@@ -350,11 +350,15 @@ func breakRange(topic *database.Topic, into []int32, param string, sep string) e
|
|||||||
}
|
}
|
||||||
into[0] = int32(v)
|
into[0] = int32(v)
|
||||||
if len(rstr) > 1 {
|
if len(rstr) > 1 {
|
||||||
v, err = strconv.ParseInt(strings.TrimSpace(rstr[1]), 10, 32)
|
if len(rstr[1]) == 0 {
|
||||||
if err != nil {
|
into[1] = -1
|
||||||
return fmt.Errorf("posts not found: %s in topic %d", param, topic.Number)
|
} else {
|
||||||
|
v, err = strconv.ParseInt(strings.TrimSpace(rstr[1]), 10, 32)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("posts not found: %s in topic %d", param, topic.Number)
|
||||||
|
}
|
||||||
|
into[1] = int32(v)
|
||||||
}
|
}
|
||||||
into[1] = int32(v)
|
|
||||||
} else {
|
} else {
|
||||||
into[1] = into[0]
|
into[1] = into[0]
|
||||||
}
|
}
|
||||||
@@ -566,7 +570,9 @@ func ReadPosts(ctxt ui.AmContext) (string, any, error) {
|
|||||||
ctxt.VarMap().Set("isSticky", topic.Sticky)
|
ctxt.VarMap().Set("isSticky", topic.Sticky)
|
||||||
confNukePerm := conf.TestPermission("Conference.Nuke", myLevel)
|
confNukePerm := conf.TestPermission("Conference.Nuke", myLevel)
|
||||||
ctxt.VarMap().Set("canDelete", confNukePerm)
|
ctxt.VarMap().Set("canDelete", confNukePerm)
|
||||||
ctxt.VarMap().Set("canPost", (!(topic.Frozen || topic.Archived) || confHidePerm) && conf.TestPermission("Conference.Post", myLevel))
|
confPostPerm := conf.TestPermission("Conference.Post", myLevel)
|
||||||
|
ctxt.VarMap().Set("canPost", (!(topic.Frozen || topic.Archived) || confHidePerm) && confPostPerm)
|
||||||
|
ctxt.VarMap().Set("showFrozenArchiveMessages", confPostPerm)
|
||||||
|
|
||||||
// Set advanced controls.
|
// Set advanced controls.
|
||||||
advancedControls := ctxt.HasParameter("ac") && (len(posts) == 1)
|
advancedControls := ctxt.HasParameter("ac") && (len(posts) == 1)
|
||||||
|
|||||||
+11
-3
@@ -90,10 +90,10 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Permalink Info -->
|
<!-- Permalink Info -->
|
||||||
<div class="text-center text-xs text-gray-600 mb-6">
|
<div class="text-center text-sm text-gray-600 mb-6">
|
||||||
<a href="{{ post_topicPermalink }}" class="text-blue-700 hover:text-blue-900">[Permalink to this topic]</a>
|
<a href="{{ post_topicPermalink }}" class="text-blue-700 hover:text-blue-900" title="Permalink to this topic">🔗Topic</a>
|
||||||
<span class="mx-2">·</span>
|
<span class="mx-2">·</span>
|
||||||
<a href="{{ postsPermalink }}" class="text-blue-700 hover:text-blue-900">[Permalink to these posts]</a>
|
<a href="{{ postsPermalink }}" class="text-blue-700 hover:text-blue-900" title="Permalink to these posts">🔗Posts</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Messages -->
|
<!-- Messages -->
|
||||||
@@ -203,6 +203,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
{{ else if showFrozenArchiveMessages }}
|
||||||
|
<div class="text-center text-md text-gray-600">
|
||||||
|
{{ if isArchived }}
|
||||||
|
<b>This Is an <i>Archived</i> Topic</b>
|
||||||
|
{{ else if isFrozen }}
|
||||||
|
<b>This Is a <i>Frozen</i> Topic</b>
|
||||||
|
{{ end }}
|
||||||
|
</div>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,8 @@
|
|||||||
<div class="text-sm text-gray-600">
|
<div class="text-sm text-gray-600">
|
||||||
<a href="{{ post_stem }}?r={{ post_cur.Num }}&ac=1" class="text-blue-700 hover:text-blue-900 font-mono">{{ post_cur.Num }}</a> of
|
<a href="{{ post_stem }}?r={{ post_cur.Num }}&ac=1" class="text-blue-700 hover:text-blue-900 font-mono">{{ post_cur.Num }}</a> of
|
||||||
<a href="{{ post_stem }}?r={{ post_max }}&ac=1" class="text-blue-700 hover:text-blue-900 font-mono">{{ post_max }}</a>
|
<a href="{{ post_stem }}?r={{ post_max }}&ac=1" class="text-blue-700 hover:text-blue-900 font-mono">{{ post_max }}</a>
|
||||||
🔗 <a href="{{ post_topicPermalink }}.{{ post_cur.Num }}" class="ml-2 text-xs text-blue-700 hover:text-blue-900"><{{ post_confRef }}.{{ post_cur.Num }}></a>
|
<a href="{{ post_topicPermalink }}.{{ post_cur.Num }}" class="ml-2 text-xs text-blue-700 hover:text-blue-900"
|
||||||
|
title="Permalink to this post">🔗<{{ post_confRef }}.{{ post_cur.Num }}></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
|
|||||||
Reference in New Issue
Block a user