Skip to content

Commit

Permalink
#311 답변 기능을 제외합니다.
Browse files Browse the repository at this point in the history
  • Loading branch information
@xharpenParksuhyeon
xharpenParksuhyeon committed Aug 26, 2021
1 parent 146672d commit bcaaff1
Show file tree
Hide file tree
Showing 44 changed files with 531 additions and 1,714 deletions.
28 changes: 0 additions & 28 deletions assets/js/src/toggleMenu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,6 @@ var BoardToggleMenu = {
}
});
}
},
adopt: function(e, url) {
e.preventDefault();

url = url + window.location.search;

XE.ajax({
url: url,
type: 'post',
dataType: 'json',
success: function (data) {
location.replace(data.links.href);
}
});
},
unAdopt: function(e, url) {
e.preventDefault();

url = url + window.location.search;

XE.ajax({
url: url,
type: 'post',
dataType: 'json',
success: function (data) {
location.replace(data.links.href);
}
});
}
};

Expand Down
7 changes: 0 additions & 7 deletions components/Modules/BoardModule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ protected static function registerSettingsRoute()
Route::get('/global/permission', ['as' => 'settings.board.board.global.permission', 'uses' => 'BoardSettingsController@editGlobalPermission']);
Route::post('/global/permission/update', ['as' => 'settings.board.board.global.permission.update', 'uses' => 'BoardSettingsController@updateGlobalPermission']);
Route::get('/global/toggleMenu', ['as' => 'settings.board.board.global.toggleMenu', 'uses' => 'BoardSettingsController@editGlobalToggleMenu']);
Route::get('/global/reply', ['as' => 'settings.board.board.global.reply', 'uses' => 'BoardSettingsController@editGlobalReply']);
Route::post('/global/reply/update', ['as' => 'settings.board.board.global.reply.update', 'uses' => 'BoardSettingsController@updateGlobalReply']);
Route::get('/global/{target}', ['as' => 'settings.board.board.global.edit', 'uses' => 'BoardSettingsController@editGlobal']);

// module
Expand All @@ -118,8 +116,6 @@ protected static function registerSettingsRoute()
Route::post('columns/update/{boardId}', ['as' => 'settings.board.board.columns.update', 'uses' => 'BoardSettingsController@updateColumns']);
Route::get('dynamicField/edit/{boardId}', ['as' => 'settings.board.board.dynamicField', 'uses' => 'BoardSettingsController@editDynamicField']);
Route::get('toggleMenu/edit/{boardId}', ['as' => 'settings.board.board.toggleMenu', 'uses' => 'BoardSettingsController@editToggleMenu']);
Route::get('reply/edit/{boardId}', ['as' => 'settings.board.board.reply', 'uses' => 'BoardSettingsController@editReply']);
Route::post('reply/update/{boardId}', ['as' => 'settings.board.board.reply.update', 'uses' => 'BoardSettingsController@updateReply']);
Route::get('{target}/edit/{boardId}', ['as' => 'settings.board.board.edit', 'uses' => 'BoardSettingsController@edit']);

Route::post('storeCategory/', [
Expand Down Expand Up @@ -172,9 +168,6 @@ protected static function registerInstanceRoute()

Route::delete('/destroy/{id}', ['as' => 'destroy', 'uses' => 'BoardModuleController@destroy']);

Route::post('/adopt/{id}', ['as' => 'adopt', 'uses' => 'BoardModuleController@adopt']);
Route::post('/unAdopt/{id}', ['as' => 'unAdopt', 'uses' => 'BoardModuleController@unAdopt']);

Route::get('/guest/id/{id}', ['as' => 'guest.id', 'uses' => 'BoardModuleController@guestId']);
Route::post('/guest/certify/{id}', [
'as' => 'guest.certify', 'uses' => 'BoardModuleController@guestCertify'
Expand Down
22 changes: 9 additions & 13 deletions components/Skins/Board/Common/views/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@
<div class="board_write">
<form method="post" id="board_form" class="__board_form" action="{{ $urlHandler->get('store') }}" enctype="multipart/form-data" data-rule="board" data-rule-alert-type="toast" data-instance_id="{{$instanceId}}" data-url-preview="{{ $urlHandler->get('preview') }}">
<input type="hidden" name="_token" value="{{{ Session::token() }}}" />
<input type="hidden" name="head" value="{{ $head }}" />
<input type="hidden" name="head" value="{{$head}}" />
<input type="hidden" name="queryString" value="{{ http_build_query(Request::except('parent_id')) }}" />

@if ($parentBoard !== null)
<input type="hidden" name="parent_id" value="{{ $parentBoard->id }}" />
@endif

@foreach ($skinConfig['formColumns'] as $columnName)
@if($columnName === 'title')
<div class="write_header">
Expand All @@ -43,8 +39,8 @@
</div>
<div class="write_title">
{!! uio('titleWithSlug', [
'title' => Request::old('title', $parentBoard ? sprintf("Re: %s", $parentBoard->title) : null),
'slug' => Request::old('slug', $parentBoard ? sprintf("Re: %s", $parentBoard->title) : null),
'title' => Request::old('title'),
'slug' => Request::old('slug'),
'titleClassName' => 'bd_input',
'config' => $config
]) !!}
Expand Down Expand Up @@ -145,12 +141,12 @@ class="xf-check-item__input"
@endif

{{-- notice --}}
@if ($isManager === true && $config->get('noticePost', true) && is_null($parentBoard))
<label class="xe-label">
<input type="checkbox" name="status" value="{{\Xpressengine\Document\Models\Document::STATUS_NOTICE}}">
<span class="xe-input-helper"></span>
<span class="xe-label-text">{{xe_trans('xe::notice')}}</span>
</label>
@if ($isManager === true && $config->get('noticePost', true))
<label class="xe-label">
<input type="checkbox" name="status" value="{{\Xpressengine\Document\Models\Document::STATUS_NOTICE}}">
<span class="xe-input-helper"></span>
<span class="xe-label-text">{{xe_trans('xe::notice')}}</span>
</label>
@endif
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/Skins/Board/Common/views/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
@endif

{{-- notice --}}
@if ($isManager === true && $config->get('noticePost', true) && $item->hasParentDoc() === false)
@if ($isManager === true && $config->get('noticePost', true))
<label class="xe-label">
<input type="checkbox" name="status" value="{{$item::STATUS_NOTICE}}" @if($item->status == $item::STATUS_NOTICE) checked="checked" @endif>
<span class="xe-input-helper"></span>
Expand Down
19 changes: 3 additions & 16 deletions components/Skins/Board/Common/views/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,10 @@
</div>

<div class="bd_function_r">
<a href="{{ $urlHandler->get('index', array_merge(Request::except('parent_id'))) }}" class="bd_ico bd_list"><i class="xi-list"></i><span class="xe-sr-only">{{xe_trans('xe::list')}}</span></a>

<a href="{{ $urlHandler->get('index', array_merge(Request::all())) }}" class="bd_ico bd_list"><i class="xi-list"></i><span class="xe-sr-only">{{xe_trans('xe::list')}}</span></a>
@if($isManager == true || $item->user_id == Auth::user()->getId() || $item->user_type === $item::USER_TYPE_GUEST)
@if($isManager === true || ($replyConfig !== null && $replyConfig->get('protectUpdated') && $item->existsReplies()) === false)
<a href="{{ $urlHandler->get('edit', array_merge(Request::except('parent_id'), ['id' => $item->id])) }}" class="bd_ico bd_modify">
<i class="xi-eraser"></i><span class="xe-sr-only">{{ xe_trans('xe::update') }}</span>
</a>
@endif

@if($isManager === true || ($replyConfig !== null && $replyConfig->get('protectDeleted') && $item->existsReplies()) === false)
<a href="#" class="bd_ico bd_delete" data-url="{{ $urlHandler->get('destroy', array_merge(Request::except('parent_id'), ['id' => $item->id])) }}">
<i class="xi-trash"></i><span class="xe-sr-only">{{ xe_trans('xe::delete') }}</span>
</a>
@endif
<a href="{{ $urlHandler->get('edit', array_merge(Request::all(), ['id' => $item->id])) }}" class="bd_ico bd_modify"><i class="xi-eraser"></i><span class="xe-sr-only">{{ xe_trans('xe::update') }}</span></a>
<a href="#" class="bd_ico bd_delete" data-url="{{ $urlHandler->get('destroy', array_merge(Request::all(), ['id' => $item->id])) }}"><i class="xi-trash"></i><span class="xe-sr-only">{{ xe_trans('xe::delete') }}</span></a>
@endif
<div class="bd_more_area">
<!-- [D] 클릭시 클래스 on 적용 -->
Expand All @@ -130,9 +120,6 @@
</div>
@endif
<!-- // 댓글 -->

{{-- {{ dd($childItems->all()) }}--}}

<!--bottomViewContent-->
{!! xe_trans($config->get('bottomViewContent', '')) !!}

Expand Down
16 changes: 1 addition & 15 deletions components/Skins/Board/Settings/Common/views/global/config.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@inject('anonymityHandler', 'Xpressengine\Plugins\Board\AnonymityHandler')

@section('page_title')
<h2>{{xe_trans($_activeMenu->getTitle())}}</h2>
<h2>{{xe_trans($_activeMenu->getTitle())}}</h2>
@endsection

@section('page_description')
Expand Down Expand Up @@ -288,20 +288,6 @@
</div>
</div>

<div class="row">
<div class="col-sm-6">
<div class="form-group">
<div class="clearfix">
<label>{{xe_trans('board::reply')}} </label>
</div>
<select id="" name="replyPost" class="form-control">
<option value="true" {!! $config->get('replyPost', false) == true ? 'selected="selected"' : '' !!} >{{xe_trans('xe::use')}}</option>
<option value="false" {!! $config->get('replyPost', false) == false ? 'selected="selected"' : '' !!} >{{xe_trans('xe::disuse')}}</option>
</select>
</div>
</div>
</div>

<div class="row">
<div class="col-sm-6">
<div class="form-group">
Expand Down
106 changes: 0 additions & 106 deletions components/Skins/Board/Settings/Common/views/global/reply.blade.php
View file

This file was deleted.

Loading

0 comments on commit bcaaff1

Please sign in to comment.