Form->unlockField('PhotoAlbumPhoto..' . PhotoAlbumPhoto::ATTACHMENT_FIELD_NAME);
@@ -23,8 +27,16 @@
'required' => true,
'multiple',
'nc-photo-albums-preview' => 'preview()',
+ 'onChange' => 'photoAlbumValidateUploadFileCount(this)',
+ 'data-max-file-uploads' => $maxFileUploads,
)
);
+ ?>
+
+
+ NetCommonsForm->hidden(
'PhotoAlbum.selectedJacketIndex',
array('ng-value' => 'selectedJacket.index')
diff --git a/View/Helper/PhotoAlbumsImageHelper.php b/View/Helper/PhotoAlbumsImageHelper.php
index d769908..ec91b84 100644
--- a/View/Helper/PhotoAlbumsImageHelper.php
+++ b/View/Helper/PhotoAlbumsImageHelper.php
@@ -86,6 +86,51 @@ public function photoUrl($data, $size = null) {
);
}
+/**
+ * is_active: trueだったらinlineイメージにして、is_active:falseならURLをかえす
+ *
+ * @param array $data PhotoAlbumAlbumPhoto data
+ * @param string $size thumb, small, medium, big
+ * @return string
+ */
+ public function inlinePhotoIfActiveOtherwisePhotoUrl($data, $size = null) {
+ if ($data['PhotoAlbumPhoto']['is_active']) {
+ return $this->__inlinePhoto($data, $size);
+ }
+ return $this->photoUrl($data, $size);
+ }
+
+/**
+ * インライン画像
+ *
+ * @param array $data PhotoAlbumAlbumPhoto data
+ * @param string $size thumb, small, medium, big
+ * @return string
+ */
+ private function __inlinePhoto($data, $size = null) {
+ /** @var UploadFile $uploadFile */
+ $uploadFile = ClassRegistry::init("Files.UploadFile");
+ $file = $uploadFile->getFile(
+ 'photo_albums',
+ $data['PhotoAlbumPhoto']['id'],
+ PhotoAlbumPhoto::ATTACHMENT_FIELD_NAME
+ );
+ if (!$file) {
+ return '';
+ }
+ $filepath = UPLOADS_ROOT .
+ $file['UploadFile']['path'] . DS .
+ $file['UploadFile']['id'] . DS .
+ $size . '_' . $file['UploadFile']['real_file_name'];
+
+ if (file_exists($filepath) === false) {
+ return '';
+ }
+ $mimeType = $file['UploadFile']['mimetype'];
+ $encodeData = base64_encode(file_get_contents($filepath));
+ return sprintf('data:%s;base64,%s', $mimeType, $encodeData);
+ }
+
/**
* Creates photo image url array
*
diff --git a/View/PhotoAlbumPhotos/edit.ctp b/View/PhotoAlbumPhotos/edit.ctp
index 7459c81..bf0975b 100644
--- a/View/PhotoAlbumPhotos/edit.ctp
+++ b/View/PhotoAlbumPhotos/edit.ctp
@@ -7,6 +7,10 @@
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
*/
+
+?>
+NetCommonsHtml->script('/photo_albums/js/photo_album_photo_edit.js');
?>
assign('title_for_modal', __d('photo_albums', 'Add photo')); ?>
@@ -39,15 +43,40 @@
NetCommonsForm->hidden('block_id'); ?>
NetCommonsForm->hidden('status'); ?>
-
+ Form->unlockField(
+ 'PhotoAlbumPhoto.' . PhotoAlbumPhoto::ATTACHMENT_FIELD_NAME
+ );
+ // バリデーションエラーが表示されるようにフィールド名はモデルフィールド名のままで、name属性で複数可能なフィールド指定
+ echo $this->NetCommonsForm->uploadFile(
+ 'PhotoAlbumPhoto.' . PhotoAlbumPhoto::ATTACHMENT_FIELD_NAME,
+ array(
+ 'label' => __d('photo_albums', 'Photo file'),
+ 'required' => true,
+ 'multiple',
+ 'name' => 'data[PhotoAlbumPhoto][photo][]',
+
+ 'onChange' => 'photoAlbumValidateUploadFileCount(this)',
+ 'data-max-file-uploads' => $maxFileUploads,
+ )
+ );
+ ?>
+
+
+
+ NetCommonsForm->uploadFile(
PhotoAlbumPhoto::ATTACHMENT_FIELD_NAME,
array(
'label' => __d('photo_albums', 'Photo file'),
'remove' => false
)
- )
- ?>
+ );
+ ?>
+
NetCommonsForm->input(
diff --git a/View/PhotoAlbumPhotos/index.ctp b/View/PhotoAlbumPhotos/index.ctp
index 8a6a855..686f085 100644
--- a/View/PhotoAlbumPhotos/index.ctp
+++ b/View/PhotoAlbumPhotos/index.ctp
@@ -11,6 +11,9 @@
NetCommonsHtml->css('/photo_albums/css/photo_albums.css'); ?>
NetCommonsHtml->script('/photo_albums/js/photo_albums.js'); ?>
+NetCommonsHtml->script('/photo_albums/js/photo_album_photo_edit.js');
+?>