From 1a4fdeaca6854fffada3d1731ce37ad93d6dabb7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 15:57:28 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/views/issue/issueDetail.html |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index a8621af..63b974f 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -499,12 +499,12 @@
                                         tabindex="-1"
                                         class="form-control form-control-sm"
                                         ng-change="fn.changeDetailPageRowCount()"
-                                        ng-model="vm.page.selectedRelPageRowCount">
+                                        ng-model="vm.subPage.selectedRelPageRowCount">
                                     <option value="10">10</option>
                                     <option value="50">50</option>
                                     <option value="100">100</option>
-                                </select> {{vm.page.selectedRelPage}}-{{vm.responseData.relPage.totalPage}} /
-                                {{vm.responseData.relPage.totalCount | number}}<span translate="common.few">嫄�</span>
+                                </select> {{vm.subPage.selectedRelPage}}-{{vm.responseData.relTotalPage}} /
+                                {{vm.responseData.relTotalCount | number}}<span translate="common.few">嫄�</span>
                             </label>
                         </div>
                     </div>
@@ -565,11 +565,11 @@
                     <div class="controls-below-table text-center">
                         <ul uib-pagination
                             boundary-links-numbes="true"
-                            items-per-page="vm.page.selectedRelPageRowCount"
-                            total-items="vm.responseData.relPage.totalCount"
-                            ng-model="vm.page.selectedRelPage"
+                            items-per-page="vm.subPage.selectedRelPageRowCount"
+                            total-items="vm.responseData.relTotalCount"
+                            ng-model="vm.subPage.selectedRelPage"
                             max-size="10"
-                            ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)"
+                            ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
                             class="pagination pagination-sm"
                             previous-text="&lt;"
                             next-text="&gt;"
@@ -599,12 +599,12 @@
                                         tabindex="-1"
                                         class="form-control form-control-sm"
                                         ng-change="fn.changeDetailPageRowCount()"
-                                        ng-model="vm.page.selectedDownPageRowCount">
+                                        ng-model="vm.subPage.selectedDownPageRowCount">
                                     <option value="10">10</option>
                                     <option value="50">50</option>
                                     <option value="100">100</option>
-                                </select> {{vm.page.selectedDownPage}}-{{vm.responseData.downPage.totalPage}} /
-                                {{vm.responseData.downPage.totalCount | number}}<span translate="common.few">嫄�</span>
+                                </select> {{vm.subPage.selectedDownPage}}-{{vm.responseData.downTotalPage}} /
+                                {{vm.responseData.downTotalCount | number}}<span translate="common.few">嫄�</span>
                             </label>
                         </div>
                     </div>
@@ -655,11 +655,11 @@
                     <div class="controls-below-table text-center">
                         <ul uib-pagination
                             boundary-links-numbes="true"
-                            items-per-page="vm.page.selectedDownPageRowCount"
-                            total-items="vm.responseData.downPage.totalCount"
-                            ng-model="vm.page.selectedDownPage"
+                            items-per-page="vm.subPage.selectedDownPageRowCount"
+                            total-items="vm.responseData.downTotalCount"
+                            ng-model="vm.subPage.selectedDownPage"
                             max-size="10"
-                            ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)"
+                            ng-click="fn.getIssueDetail(vm.subPage.selectedRelPage - 1, vm.subPage.selectedDownPage - 1)"
                             class="pagination pagination-sm"
                             previous-text="&lt;"
                             next-text="&gt;"

--
Gitblit v1.8.0