Skip to content

Commit

Permalink
admin assumes the local documentation extension is installed LDEV-2695 (
Browse files Browse the repository at this point in the history
#847)

* Added a fix for LDEV-2695

* Modified the title for ldev-2695
  • Loading branch information
cfmitrah authored Apr 1, 2021
1 parent a201df7 commit 126cee2
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
17 changes: 16 additions & 1 deletion core/src/main/cfml/context/admin/overview.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,16 @@ Error Output --->
type="#request.adminType#"
password="#session["password"&request.adminType]#"
returnVariable="contexts">
<cfadmin
action="getExtensions"
type="server"
password="#session["password"&request.adminType]#"
returnVariable="docsServer">
<cfadmin
action="getExtensions"
type="web"
password="#session["password"&request.adminType]#"
returnVariable="docsWeb">

<cfif request.adminType EQ "server">
<cfset names=StructKeyArray(info.servlets)>
Expand Down Expand Up @@ -777,7 +787,12 @@ Error Output --->
<!--- Reference --->
<tr>
<td>
<a href="../doc/index.cfm" target="_blank">#stText.Overview.localRefLink#</a>
<cfif Listfind(valueList(docsServer.name),"Lucee Documentation") eq 0 && Listfind(valueList(docsWeb.name),"Lucee Documentation") eq 0>
<a href="#cgi.script_name#?action=ext.applications" title="#stText.overview.installDocsLink#">
#stText.Overview.localRefLink#</a>
<cfelse>
<a href="../doc/index.cfm" target="_blank">#stText.Overview.localRefLink#</a>
</cfif>
<div class="comment">#stText.Overview.localRefDesc#</div>
</td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions core/src/main/cfml/context/admin/resources/language/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,7 @@ If the timezone of your Lucee instance and your database is different, this can
<data key="overview.Docs">Documentation</data>
<data key="overview.DocsDesc">If you have any questions about Lucee please take a look at the documentation in the first instance.</data>
<data key="overview.onlineDocsLink">Online Documentation</data>
<data key="overview.installDocsLink">Click to install - Lucee Documentation Extension</data>
<data key="overview.localRefLink">Local Reference</data>
<data key="overview.issuetracker">Issue Tracker</data>
<data key="overview.issuetrackerDesc">If you think you've found a bug, please take the time to report it via our bug tracking system.</data>
Expand Down

0 comments on commit 126cee2

Please sign in to comment.