ensure block namespaces, import block group closes #1431

luyadev · Sep 3, 2017 · 30e0cb2 · 30e0cb2
1 parent 78a9729
commit 30e0cb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/modules/cms/src/admin/importers/BlockImporter.php b/modules/cms/src/admin/importers/BlockImporter.php
@@ -56,6 +56,8 @@ public function run()
  */
  protected function saveBlock($fullClassName)
  {
+ // ensure all classes start with trailing slash class name definition like `\foo\bar\Class`
+ $fullClassName = '\\' . ltrim($fullClassName, '\\');
  $model = Block::find()->where(['class' => $fullClassName])->one();
 
  $blockObject = $this->createBlockObject($fullClassName);
@@ -112,15 +114,20 @@ protected function getBlockGroupId(BlockInterface $blockObject)
  {
  $groupClassName = $blockObject->blockGroup();
 
- $identifier = Yii::createObject(['class' => $groupClassName])->identifier();
-
- $group = BlockGroup::findOne(['identifier' => $identifier]);
-
- // @TODO if not found, add group to database
+ $groupObject = Yii::createObject(['class' => $groupClassName]);
 
+ $group = BlockGroup::findOne(['identifier' => $groupObject->identifier()]);
 
  if ($group) {
  return $group->id;
+ } else {
+ $model = new BlockGroup();
+ $model->name = $groupObject->label();
+ $model->identifier = $groupObject->identifier();
+ $model->created_timestamp = time();
+ if ($model->save()) {
+ return $model->id;
+ }
  }
 
  return 0;

diff --git a/modules/cms/src/models/BlockGroup.php b/modules/cms/src/models/BlockGroup.php
@@ -56,12 +56,4 @@ public function rules()
  ['identifier', 'unique'],
  ];
  }
-
- public function scenarios()
- {
- return [
- 'restcreate' => ['name', 'identifier'],
- 'restupdate' => ['name', 'identifier'],
- ];
- }
 }