Skip to content

[カテゴリ設定]クラス名の登録時にチェック処理を追加(必須&ユニーク) #1887

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.

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions app/Plugins/Manage/SiteManage/SiteManage.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Lang;
use Illuminate\Validation\Rule;

use setasign\Fpdi\Tcpdf\Fpdi;

Expand Down Expand Up @@ -509,29 +510,44 @@ public function saveCategories($request, $id)
if (!empty($request->add_display_sequence) || !empty($request->add_classname) || !empty($request->add_category) || !empty($request->add_color) || !empty($request->add_background_color)) {
// 項目のエラーチェック
$rules['add_display_sequence'] = ['required'];
$rules['add_classname'] = ['required', 'unique:categories,classname'];
$rules['add_category'] = ['required'];
$rules['add_color'] = ['required'];
$rules['add_background_color'] = ['required'];

$setAttributeNames['add_display_sequence'] = '追加行の表示順';
$setAttributeNames['add_classname'] = 'クラス名';
$setAttributeNames['add_category'] = '追加行のカテゴリ';
$setAttributeNames['add_color'] = '追加行の文字色';
$setAttributeNames['add_background_color'] = '追加行の背景色';
}

// 既存項目のidに値が入っていたら、行の他の項目も必須
$is_not_unique = false;
if (!empty($request->categories_id)) {
foreach ($request->categories_id as $category_id) {
// 項目のエラーチェック
$rules['display_sequence.'.$category_id] = ['required'];
$rules['classname.'.$category_id] = ['required'];
$rules['category.'.$category_id] = ['required'];
$rules['color.'.$category_id] = ['required'];
$rules['background_color.'.$category_id] = ['required'];

$setAttributeNames['display_sequence.'.$category_id] = '表示順';
$setAttributeNames['classname.'.$category_id] = 'クラス名';
$setAttributeNames['category.'.$category_id] = 'カテゴリ';
$setAttributeNames['color.'.$category_id] = '文字色';
$setAttributeNames['background_color.'.$category_id] = '背景色';
/**
* (classname重複チェック)categoriesを検索、classnameに同じものが1件でもあれば$is_not_uniqueにtrueをセット
*/
$is_exists = Categories::query()
->where('classname', $request->classname[$category_id])
->where('id', '!=', $category_id)
->exists();
if($is_exists){
$is_not_unique = true;
}
}
}

Expand All @@ -543,6 +559,11 @@ public function saveCategories($request, $id)
// return $this->categories($request, $id, $validator->errors());
return redirect()->back()->withErrors($validator)->withInput();
}
// classname重複チェック
if($is_not_unique){
$validator->errors()->add("duplicate_class_name_violation", 'そのクラス名は既に使用されています。');
return redirect()->back()->withErrors($validator)->withInput();
}

// 追加項目アリ
if (!empty($request->add_display_sequence)) {
Expand Down
4 changes: 2 additions & 2 deletions resources/views/plugins/manage/site/categories.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function form_delete(id) {
--}}
<tr>
<th nowrap>表示順 <span class="badge badge-danger">必須</span></th>
<th nowrap>クラス名</th>
<th nowrap>クラス名 <span class="badge badge-danger">必須</span></th>
<th nowrap>カテゴリ <span class="badge badge-danger">必須</span></th>
<th nowrap>文字色 <span class="badge badge-danger">必須</span></th>
<th nowrap>背景色 <span class="badge badge-danger">必須</span></th>
Expand Down Expand Up @@ -126,7 +126,7 @@ function form_delete(id) {
<li>カテゴリ設定後は、各プラグインのカテゴリ設定で表示設定が必要です。</li>
<li>各プラグインのカテゴリ設定から、コンテンツ単位で独自カテゴリを設定することも可能です。</li>
<li>「文字色」「背景色」にはHTMLで指定できる色キーワード(例:<code>red</code>, <code>blue</code>)やRGB色(例:<code>#000000</code>, <code>#111</code>)等を設定できます。</li>
<li>「クラス名」はCSSのクラス名を設定できます。<code>cc_category_クラス名</code> で使用できます。</li>
<li>「クラス名」はCSSのクラス名を設定できます。<code>cc_category_クラス名</code> で使用できます。「クラス名」は重複しないように設定してください。</li>
</ul>
</div>

Expand Down