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
9b78c046
Commit
9b78c046
authored
Feb 25, 2015
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#15370 カスタムURI起動時、該当コンテンツが存在しない場合警告メッセージが表示されない
parent
d4c5cce0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
3 deletions
+36
-3
abvw/common/json/lang/lang-ja.json
+1
-1
abvw/js/contentview_CreateObjects.js
+1
-1
abvw/js/login.js
+34
-1
No files found.
abvw/common/json/lang/lang-ja.json
View file @
9b78c046
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
"txtContentWarning"
:
"警告"
,
"txtContentWarning"
:
"警告"
,
"txtMediaAutoPlayWarning"
:
"メディアは自動再生されます。"
,
"txtMediaAutoPlayWarning"
:
"メディアは自動再生されます。"
,
"txtPreventLink"
:
"プレビューにはこの機能が利用できません。"
,
"txtPreventLink"
:
"プレビューにはこの機能が利用できません。"
,
"msgContentNotExist"
:
"
コンテンツが
存在しません。"
,
"msgContentNotExist"
:
"
該当するコンテンツは
存在しません。"
,
"txtShare"
:
"共有"
,
"txtShare"
:
"共有"
,
"txtDashMark"
:
"~"
,
"txtDashMark"
:
"~"
,
"txtUrlValidDate"
:
"URL有効期間"
,
"txtUrlValidDate"
:
"URL有効期間"
,
...
...
abvw/js/contentview_CreateObjects.js
View file @
9b78c046
...
@@ -1258,7 +1258,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
...
@@ -1258,7 +1258,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
},
},
function
(
xmlHttpRequest
,
txtStatus
,
errorThrown
)
{
function
(
xmlHttpRequest
,
txtStatus
,
errorThrown
)
{
if
(
xmlHttpRequest
.
status
==
404
)
{
if
(
xmlHttpRequest
.
status
==
404
)
{
showAlertScreen
(
I18N
.
i18nText
(
'msgContentNotExist'
)
);
CONTENTVIEW
.
showAlertScreen
(
I18N
.
i18nText
(
'msgContentNotExist'
),
null
);
}
}
else
{
else
{
// Show system error
// Show system error
...
...
abvw/js/login.js
View file @
9b78c046
...
@@ -784,7 +784,8 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
...
@@ -784,7 +784,8 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
if
(
ClientData
.
isGetitsMode
()
==
true
){
if
(
ClientData
.
isGetitsMode
()
==
true
){
AVWEB
.
avwScreenMove
(
"abvw/"
+
COMMON
.
ScreenIds
.
Login
);
AVWEB
.
avwScreenMove
(
"abvw/"
+
COMMON
.
ScreenIds
.
Login
);
}
else
{
}
else
{
AVWEB
.
avwScreenMove
(
"abvw/"
+
COMMON
.
ScreenIds
.
Home
);
//アラートメッセージ表示
LOGIN
.
showAlertScreen
(
I18N
.
i18nText
(
'msgContentNotExist'
),
"abvw/"
+
COMMON
.
ScreenIds
.
Home
);
}
}
}
}
);
);
...
@@ -821,6 +822,38 @@ LOGIN.getUrlPath = function(){
...
@@ -821,6 +822,38 @@ LOGIN.getUrlPath = function(){
}
}
};
};
/* display alert screen*/
LOGIN
.
showAlertScreen
=
function
(
errMes
,
scrMove
)
{
// アラートメッセージの表示
if
(
errMes
==
undefined
||
errMes
==
""
){
errMes
=
"message."
;
//I18N.i18nText('msgPageImgErr');
}
COMMON
.
lockLayout
();
/* show error messages */
$
().
toastmessage
({
position
:
'middle-center'
});
$
().
toastmessage
(
'showToast'
,
{
type
:
'error'
,
sticky
:
true
,
text
:
errMes
,
close
:
function
()
{}
});
$
(
'.toast-type-error'
).
css
(
'height'
,
'100px'
);
$
(
'.toast-type-error > p'
).
css
(
'padding-top'
,
'35px'
);
$
(
'.toast-item-close'
).
live
(
'click'
,
function
()
{
COMMON
.
unlockLayout
();
if
(
scrMove
){
AVWEB
.
avwScreenMove
(
scrMove
);
}
}
);
};
//$(document).ready(function (e) {
//$(document).ready(function (e) {
LOGIN
.
ready
=
function
(){
LOGIN
.
ready
=
function
(){
...
...
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