Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
7b1ee577
Commit
7b1ee577
authored
Nov 18, 2022
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix go to index page when dashboard home enabled
parent
5cc1db79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
26 deletions
+9
-26
abweb/common/html/header.html
+1
-1
abweb/js/topPage/topPage.js
+8
-25
No files found.
abweb/common/html/header.html
View file @
7b1ee577
...
...
@@ -13,7 +13,7 @@
</a>
</li>
<li
class=
"nav-link"
id=
"iconHomeWorkList"
>
<a
href=
"index.html"
class=
"d-block text-center text-decoration-none"
>
<a
href=
"index.html
?pageId=workList
"
class=
"d-block text-center text-decoration-none"
>
<img
src=
"../common/img/nav_icon_task.svg"
type=
"image"
alt=
""
class=
"p-sm-1 p-0 img-fluid lang"
lang=
"workList"
>
<div
class=
"fs-7 d-sm-block d-none lang"
lang=
"workList"
></div>
</a>
...
...
abweb/js/topPage/topPage.js
View file @
7b1ee577
...
...
@@ -19,30 +19,13 @@ $(document).ready(function () {
* show page
*/
TOP
.
init
=
function
()
{
HEADER
.
goToHomePage
();
COMMON
.
closeLoading
();
};
/**
* Show page by arbitrary id
*
* @param {String} pageId
*/
TOP
.
showPage
=
function
(
pageId
)
{
//get data
if
(
pageId
==
CONSTANT
.
PAGE_NAME
.
OPERATION_LIST
)
{
OL
.
init
();
}
else
if
(
pageId
==
CONSTANT
.
PAGE_NAME
.
DASHBOARD
)
{
CHK_Dashboard
.
init
();
}
//show page
const
pages
=
document
.
getElementsByClassName
(
'page-content'
);
for
(
let
i
=
0
;
i
<
pages
.
length
;
i
++
)
{
if
(
pages
[
i
].
id
==
pageId
)
{
pages
[
i
].
style
.
display
=
'block'
;
}
else
{
pages
[
i
].
style
.
display
=
'none'
;
}
const
urlParameterList
=
COMMON
.
getUrlParameter
();
if
(
urlParameterList
&&
urlParameterList
.
pageId
==
CONSTANT
.
PAGE_NAME
.
OPERATION_LIST
)
{
//index with param page
HEADER
.
goOperationList
();
}
else
{
//go homepage by dashboard setting
HEADER
.
goToHomePage
();
}
COMMON
.
closeLoading
();
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment