merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #1312

This commit is contained in:
Prashant Singh 2019-08-21 10:17:16 +05:30
parent f3b532adef
commit 56a1fd4593
2 changed files with 36 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -998,7 +998,8 @@ return [
'edit-title' => 'Edit Page',
'edit-btn-title' => 'Save Page',
'create-success' => 'Page created successfully',
'create-failure' => 'Page cannot be created',
'create-partial' => 'Some of the pages requested already exists',
'create-failure' => 'All pages requested already exists',
'update-success' => 'Page updated successfully',
'update-failure' => 'Page cannot be updated',
'page-title' => 'Page Title',

100
packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
View File

@ -94,61 +94,10 @@ use Webkul\Core\Repositories\LocaleRepository as Locale;
'url_key' => 'required'
]);
$urlKey = request()->input('url_key');
// generate locked records combinations
$allChannels = $this->channel->all(['id']);
$allLocales = $this->locale->all(['id']);
$allCross = $allChannels->crossJoin($allLocales);
$pages = collect();
foreach ($allCross as $singleCross) {
$channel = $singleCross[0]->id;
$locale = $singleCross[1]->id;
$page = $this->cms->findOneWhere([
'channel_id' => $channel,
'locale_id' => $locale,
'url_key' => $urlKey
]);
if ($page) {
$pages->push($page);
}
}
$channels = request()->input('channels');
$locales = request()->input('locales');
// $ignorePageIDs = array();
foreach ($channels as $channel) {
foreach ($locales as $locale) {
$page = $this->cms->findOneWhere([
'channel_id' => $channel,
'locale_id' => $locale,
'url_key' => $urlKey
]);
if ($page) {
array_push($ignorePageIDs, $page->id);
}
}
}
// if (! count($ignorePageIDs)) {
// $this->validate(request(), [
// 'url_key' => 'unique:cms_pages,url_key,'
// ]);
// }
$channels = $data['channels'];
$locales = $data['locales'];
$this->validate(request(), [
'channels' => 'required',
'locales' => 'required',
'html_content' => 'required|string',
'page_title' => 'required|string',
'meta_title' => 'required|string',
@ -156,30 +105,49 @@ use Webkul\Core\Repositories\LocaleRepository as Locale;
'meta_keywords' => 'required|string'
]);
foreach ($data['channels'] as $channel) {
foreach ($data['locales'] as $locale) {
$data['content']['html'] = $data['html_content'];
$data['content']['page_title'] = $data['page_title'];
$data['content']['meta_keywords'] = $data['meta_keywords'];
$data['content']['meta_title'] = $data['meta_title'];
$data['content']['meta_description'] = $data['meta_description'];
$data['content'] = json_encode($data['content']);
$totalCount = 0;
$actualCount = 0;
foreach ($channels as $channel) {
foreach ($locales as $locale) {
$pageFound = $this->cms->findOneWhere([
'channel_id' => $channel,
'locale_id' => $locale,
'url_key' => $data['url_key']
]);
$totalCount++;
$data['channel_id'] = $channel;
$data['locale_id'] = $locale;
$data['content']['html'] = $data['html_content'];
$data['content']['page_title'] = $data['page_title'];
$data['content']['meta_keywords'] = $data['meta_keywords'];
$data['content']['meta_title'] = $data['meta_title'];
$data['content']['meta_description'] = $data['meta_description'];
if (! $pageFound) {
$result = $this->cms->create($data);
$data['content'] = json_encode($data['content']);
if ($result) {
$actualCount++;
}
}
$result = $this->cms->create($data);
unset($data['content']);
unset($pageFound);
}
}
if ($result) {
if (($actualCount != 0 && $totalCount != 0) && ($actualCount == $totalCount)) {
session()->flash('success', trans('admin::app.cms.pages.create-success'));
} else if (($actualCount != 0 && $totalCount != 0) && ($actualCount != $totalCount)) {
session()->flash('warning', trans('admin::app.cms.pages.create-partial'));
} else {
session()->flash('success', trans('admin::app.cms.pages.create-failure'));
session()->flash('error', trans('admin::app.cms.pages.create-failure'));
}
return redirect()->route($this->_config['redirect']);