Skip to content

Weko#28175: Fix responding to events that are not required by index e… #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weko3-dev20 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Weko#28175: Fix responding to events that are not required by index e… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app-tree-index-edit/src/app/tree-list2/tree-list2.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ <h3 class="panel-title">{{langJson.Index_Edit[1]}}</h3>
<span class="input-group-addon">{{langJson.English[1]}}<span class="text-danger">＊</span></span>
<input type="text" class="form-control" id="inputTitle_en" placeholder="" [(ngModel)]="detailData.index_name_english">
</div>
<span *ngIf="checkFlg" class="text-danger">英語で入力は必要です。</span>
<span *ngIf="checkIndexNameFlg" class="text-danger">{{langJson.Required_Input[1]}}</span>
</div>
</div>
</div>
Expand Down Expand Up @@ -177,7 +177,7 @@ <h3 class="panel-title">{{langJson.Index_Edit[1]}}</h3>
<span class="input-group-addon">{{langJson.English[1]}}<span class="text-danger">＊</span></span>
<input type="text" class="form-control" id="indexLink_en" placeholder="" [(ngModel)]="detailData.index_link_name_english">
</div>
<span *ngIf="checkFlg" class="text-danger">英語で入力は必要です。</span>
<span *ngIf="checkIndexLinkFlg" class="text-danger">{{langJson.Required_Input[1]}}</span>
</div>
</div>
</div>
Expand Down
28 changes: 15 additions & 13 deletions app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ export class TreeList2Component implements OnInit {
id: '',
index_name: null,
index_name_english: null,
index_link_name: null,
index_link_name_english: null,
index_link_enabled: false,
comment: '',
public_state: false,
public_date: null,
Expand Down Expand Up @@ -149,14 +152,17 @@ export class TreeList2Component implements OnInit {
Display: [],
Del_Success: [],
Add_Update_Success: [],
Err_File_Ext: []
Err_File_Ext: [],
Enter_Required_Fields: [],
Required_Input: []
};
public formData: FormData = new FormData();
private imgSrc = '';
private uploadFlg = false;
private privousUploadFlg = false;
private checkFlg = false;
public deleteFlg = false;
private checkIndexNameFlg= false;
private checkIndexLinkFlg= false;

constructor(private treeList2Service: TreeList2Service) {
}
Expand Down Expand Up @@ -354,7 +360,8 @@ export class TreeList2Component implements OnInit {
$('input[name=uploadFile]').val('');
this.selNodeId = e.node.id;
this.uploadFlg = false;
this.checkFlg = false;
this.checkIndexNameFlg = false;
this.checkIndexLinkFlg = false;
if (this.selNodeId != '0') {
this.inputFlg = true;
const modTreeDetailUrl = document.getElementById('mod_tree_detail').innerText + this.selNodeId;
Expand Down Expand Up @@ -397,9 +404,8 @@ export class TreeList2Component implements OnInit {
*/
sendingdetail() {
// ツリー詳細を編集＞サービスを呼び出す
this.checkFlg = this.inputCheck();
if (this.checkFlg) {
alert('必須入力項目を入力してください');
if (this.inputCheck()) {
alert(this.langJson.Enter_Required_Fields[1]);
return;
}
if (!this.moreCheck()) {
Expand Down Expand Up @@ -708,13 +714,9 @@ export class TreeList2Component implements OnInit {
* 入力チェック
*/
inputCheck(): boolean {
let str = this.detailData.index_name_english;
str = str.replace(/(^\s*)|(\s*$)/g, '');
if (str == '') {
return true;
} else {
return false;
}
this.checkIndexNameFlg = this.detailData.index_name_english.trim() == '';
this.checkIndexLinkFlg = this.detailData.index_link_name_english.trim() == '';
return this.checkIndexNameFlg || this.checkIndexLinkFlg;
}

/**
Expand Down