Merge pull request #27 from apuc/NotesAdd

Notes add
This commit is contained in:
kavalar 2019-12-06 16:01:07 +02:00 committed by GitHub
commit ff5f421d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions

View File

@ -71,6 +71,8 @@ class UserCard extends \common\models\UserCard
if ($post['fields']) { if ($post['fields']) {
FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_PROFILE]); FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_PROFILE]);
foreach ($post['fields'] as $item) { foreach ($post['fields'] as $item) {
$item['value'] = urldecode($item['value']);
$fieldsValue = new FieldsValueNew(); $fieldsValue = new FieldsValueNew();
$fieldsValue->field_id = $item['field_id']; $fieldsValue->field_id = $item['field_id'];
$fieldsValue->value = $item['value']; $fieldsValue->value = $item['value'];

View File

@ -51,6 +51,8 @@ class Note extends \common\models\Note
FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_NOTE]); FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_NOTE]);
foreach ( $post['fields'] as $item) { foreach ( $post['fields'] as $item) {
$item['value'] = urldecode($item['value']);
$fieldsValue = new FieldsValueNew(); $fieldsValue = new FieldsValueNew();
$fieldsValue->field_id = $item['field_id']; $fieldsValue->field_id = $item['field_id'];
$fieldsValue->item_id = $this->id; $fieldsValue->item_id = $this->id;

View File

@ -70,8 +70,7 @@ class FieldsValueNew extends \yii\db\ActiveRecord
{ {
return $this->hasOne(AdditionalFields::class, ['id' => 'field_id']); return $this->hasOne(AdditionalFields::class, ['id' => 'field_id']);
} }
/** /**
* get value for view * get value for view
* @return string * @return string
@ -94,7 +93,9 @@ class FieldsValueNew extends \yii\db\ActiveRecord
$downloadLinkHTML = ' (' . Html::a('Скачать', $this->value, ['target' => '_blank', 'download' => $filename]) . ')'; $downloadLinkHTML = ' (' . Html::a('Скачать', $this->value, ['target' => '_blank', 'download' => $filename]) . ')';
$result = $imageHTML . $downloadLinkHTML; $result = $imageHTML . $downloadLinkHTML;
} else { } else {
$result = $filename . ' (' . Html::a('Скачать', $this->value, ['target' => '_blank', 'download' => $filename]) . ')'; $imageHTML = Html::img('/media/file.png', ['width' => '100px', 'alt' => $filename]);
$downloadLinkHTML = ' (' . Html::a('Скачать', $this->value, ['target' => '_blank', 'download' => $filename]) . ')';;
$result = $imageHTML . $filename . $downloadLinkHTML;
} }
return $result; return $result;
} }
@ -137,7 +138,7 @@ class FieldsValueNew extends \yii\db\ActiveRecord
} }
$extension = explode('/', $mime)['0']; $extension = explode('/', $mime)['0'];
if (($extension === 'image') || $extension === 'application') { if ($extension === 'image') {
return true; return true;
} else { } else {
return false; return false;

BIN
frontend/web/media/file.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB