Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 82.1 Icon
edited by Super Admin
on 2026/03/19 23:16
Change comment: There is no comment for this version
To version Icon 84.1 Icon
edited by Super Admin
on 2026/03/20 01:38
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -35,6 +35,7 @@
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 37  #set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 +#set($schoolDescription = $doc.getValue('schoolDescription'))
38 38  
39 39  ## --- 生徒会組織 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -353,6 +353,9 @@
353 353   </div>
354 354   #end
355 355   </div>
357 + #if($schoolDescription && $schoolDescription.trim() != '')
358 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 + #end
356 356   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 357   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 358   #if($infoEditDate && $infoEditDate != '')
... ... @@ -978,7 +978,9 @@
978 978   #end
979 979   #if($showEditDeleteBtn)
980 980   #if($xcontext.user == $postAuthorRef)
981 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
985 + #set($editImages = $!post.getValue('images'))
986 + #set($editFiles = $!post.getValue('files'))
987 + <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
982 982   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集
983 983   </button>
984 984   #end
... ... @@ -1211,37 +1211,130 @@
1211 1211  }
1212 1212  
1213 1213  // 投稿の編集（インライン編集フォームを開く）
1214 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1220 +function openEditPost(btn) {
1215 1215   var postEl = btn.closest('.thread-post');
1216 1216   if (!postEl) return;
1217 - // 既存の編集フォームがあれば閉じる
1218 1218   var existing = postEl.querySelector('.post-edit-form');
1219 1219   if (existing) { existing.remove(); return; }
1220 1220   var bodyEl = postEl.querySelector('.thread-post-body');
1221 1221   if (!bodyEl) return;
1227 +
1228 + var schoolPage = btn.getAttribute('data-school');
1229 + var postObjNum = btn.getAttribute('data-obj');
1230 + var currentContent = btn.getAttribute('data-content') || '';
1231 + var currentImages = btn.getAttribute('data-images') || '';
1232 + var currentFiles = btn.getAttribute('data-files') || '';
1233 + var postType = btn.getAttribute('data-post-type') || 'report';
1234 +
1222 1222   var form = document.createElement('div');
1223 1223   form.className = 'post-edit-form';
1224 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1225 - '<div class="post-edit-form-actions">' +
1237 + form.setAttribute('data-school', schoolPage);
1238 + form.setAttribute('data-obj', postObjNum);
1239 +
1240 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1241 +
1242 + // コメント以外は添付ファイル編集を表示
1243 + if (postType !== 'comment') {
1244 + // 既存画像
1245 + html += '<div class="edit-attachments">';
1246 + if (currentImages.trim()) {
1247 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1248 + var imgs = currentImages.trim().split('\n');
1249 + for (var i = 0; i < imgs.length; i++) {
1250 + var img = imgs[i].trim();
1251 + if (!img) continue;
1252 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1253 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1254 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1255 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1256 + '</div>';
1257 + }
1258 + html += '</div>';
1259 + }
1260 + // 既存ファイル
1261 + if (currentFiles.trim()) {
1262 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1263 + var files = currentFiles.trim().split('\n');
1264 + for (var j = 0; j < files.length; j++) {
1265 + var f = files[j].trim();
1266 + if (!f) continue;
1267 + var displayName = f;
1268 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1269 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1270 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1271 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1272 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1273 + '</div>';
1274 + }
1275 + html += '</div>';
1276 + }
1277 + // 新規追加
1278 + html += '<div class="edit-attach-add">' +
1279 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1280 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1281 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1282 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1283 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1284 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1285 + '</div>';
1286 + html += '</div>';
1287 + }
1288 +
1289 + html += '<div class="post-edit-form-actions">' +
1226 1226   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1227 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1291 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1228 1228   '</div>';
1293 +
1294 + form.innerHTML = html;
1229 1229   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1230 1230   form.querySelector('textarea').focus();
1231 1231  }
1232 1232  
1299 +function removeEditAttach(btn) {
1300 + var item = btn.closest('.edit-attach-item');
1301 + if (item) item.remove();
1302 +}
1303 +
1233 1233  // 投稿の編集を保存
1234 -function saveEditPost(schoolPage, postObjNum) {
1235 - var textarea = document.getElementById('editContent_' + postObjNum);
1305 +function saveEditPost(btn) {
1306 + var formEl = btn.closest('.post-edit-form');
1307 + if (!formEl) return;
1308 + var schoolPage = formEl.getAttribute('data-school');
1309 + var postObjNum = formEl.getAttribute('data-obj');
1310 + var textarea = formEl.querySelector('textarea');
1236 1236   if (!textarea) return;
1237 1237   var newContent = textarea.value.trim();
1238 1238   if (!newContent) { alert('投稿内容を入力してください'); return; }
1314 +
1239 1239   var csrfEl = document.querySelector('input[name="form_token"]');
1240 1240   var csrfToken = csrfEl ? csrfEl.value : '';
1317 +
1318 + var fd = new FormData();
1319 + fd.append('schoolPage', schoolPage);
1320 + fd.append('postObj', postObjNum);
1321 + fd.append('newContent', newContent);
1322 + fd.append('form_token', csrfToken);
1323 +
1324 + // 残す画像・ファイル
1325 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1326 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1327 +
1328 + // 新規画像
1329 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1330 + if (newImgInput && newImgInput.files) {
1331 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1332 + }
1333 + // 新規ファイル
1334 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1335 + if (newFileInput && newFileInput.files) {
1336 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1337 + }
1338 +
1339 + btn.disabled = true;
1340 + btn.textContent = '保存中...';
1341 +
1241 1241   var xhr = new XMLHttpRequest();
1242 1242   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1243 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1244 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1245 1245   xhr.onload = function() {
1246 1246   try {
1247 1247   var res = JSON.parse(xhr.responseText);
... ... @@ -1249,12 +1249,13 @@
1249 1249   showToast('投稿を更新しました', 'success');
1250 1250   setTimeout(function() { location.reload(); }, 800);
1251 1251   } else {
1351 + btn.disabled = false; btn.textContent = '保存';
1252 1252   alert('編集に失敗しました: ' + (res.error || ''));
1253 1253   }
1254 - } catch(e) { alert('編集に失敗しました'); }
1354 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1255 1255   };
1256 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1257 - xhr.send(editPostData);
1356 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1357 + xhr.send(fd);
1258 1258  }
1259 1259  
1260 1260  // 投稿の削除（確認ダイアログ付き）