Skip to Content
Last modified by Super Admin on 2026/03/22 00:39
From version Icon 27.1 Icon
edited by Super Admin
on 2026/03/12 12:20
Change comment: There is no comment for this version
To version Icon 31.1 Icon
edited by Super Admin
on 2026/03/15 16:10
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -37,16 +37,6 @@
37 37   #set($newObj = $newDoc.getObject('SeitokaiCode.SchoolClass', $objNum))
38 38   $newObj.set('schoolCode', $schoolCode)
39 39   $newObj.set('schoolName', $schoolName)
40 - ## 現在の年度を初期値として設定（4月始まり）
41 - #set($now = $datetool.date)
42 - #set($currentYear = $datetool.format('yyyy', $now))
43 - #set($currentMonth = $mathtool.toInteger($datetool.format('MM', $now)))
44 - #if($currentMonth >= 4)
45 - #set($fiscalYear = $currentYear)
46 - #else
47 - #set($fiscalYear = $mathtool.sub($mathtool.toInteger($currentYear), 1).toString())
48 - #end
49 - $newObj.set('fiscalYear', $fiscalYear)
50 50   $newDoc.saveWithProgrammingRights('学校ページを新規作成')
51 51   ## 作成後にビューにリダイレクト
52 52   $response.sendRedirect($xwiki.getURL($targetPage, 'view'))
... ... @@ -89,7 +89,7 @@
89 89   <div id="selectedSchoolInfo" class="selected-school-info"></div>
90 90   <div id="selectedSchoolCode" class="selected-school-code"></div>
91 91   </div>
92 - <button type="button" onclick="clearSelection()" class="btn-change-school">変更</button>
82 + <button type="button" onclick="clearSelection()" class="btn-change-school">選択解除</button>
93 93   </div>
94 94   </div>
95 95   </div>
... ... @@ -131,7 +131,8 @@
131 131  
132 132   // schools.json をロード（XWiki添付ファイルとして配置）
133 133   // 配置先: SeitokaiCode.SchoolMasterData の添付ファイル
134 - fetch('/rest/wikis/xwiki/spaces/SeitokaiCode/pages/SchoolMasterData/attachments/schools.json')
124 + var restBase = '$request.contextPath/rest/wikis/xwiki';
125 + fetch(restBase + '/spaces/SeitokaiCode/pages/SchoolMasterData/attachments/schools.json')
135 135   .then(function(r) { return r.json(); })
136 136   .then(function(data) { schools = data; schoolsLoaded = true; })
137 137   .catch(function() {
... ... @@ -198,13 +198,13 @@
198 198  
199 199   // 重複チェック（XWikiにページが存在するか確認）
200 200   var targetPage = 'Schools.' + school.code + '.WebHome';
201 - fetch('/rest/wikis/xwiki/spaces/Schools/spaces/' + school.code + '/pages/WebHome')
192 + fetch(restBase + '/spaces/Schools/spaces/' + school.code + '/pages/WebHome')
202 202   .then(function(r) {
203 203   if (r.ok) {
204 204   // 既存ページあり
205 205   document.getElementById('duplicateWarning').style.display = 'block';
206 206   document.getElementById('duplicateLink').href =
207 - '/bin/Schools/' + school.code + '/';
198 + '$request.contextPath/bin/Schools/' + school.code + '/';
208 208   document.getElementById('submitArea').style.display = 'none';
209 209   } else {
210 210   // 新規作成OK
... ... @@ -259,6 +259,15 @@
259 259   selectedIdx = -1;
260 260   }
261 261   });
253 +
254 + // 送信時ローディング
255 + var csForm = document.getElementById('createSchoolForm');
256 + if (csForm) {
257 + csForm.addEventListener('submit', function() {
258 + var btn = csForm.querySelector('button[type="submit"]');
259 + if (btn) { btn.disabled = true; btn.innerHTML = '<span class="btn-spinner"></span> 作成中...'; }
260 + });
261 + }
262 262  })();
263 263  </script>
264 264  {{/html}}