Skip to content

Commit eab3c1e

Browse files
authored
Merge pull feature #5 : patch-1-configurable-image-preview
configurable image preview at each case by configure settings * prepare configure keys at the configure file * make the patch based on comments on oficial repository * inicialize and chek the config variables also when will render fields
2 parents 07013a2 + 45767c0 commit eab3c1e

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

application/config/grocery_crud.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
$config['grocery_crud_file_upload_allow_file_types'] = 'gif|jpeg|jpg|png|tiff|doc|docx|txt|odt|xls|xlsx|pdf|ppt|pptx|pps|ppsx|mp3|m4a|ogg|wav|mp4|m4v|mov|wmv|flv|avi|mpg|ogv|3gp|3g2';
1212
$config['grocery_crud_file_upload_max_file_size'] = '20MB'; //ex. '10MB' (Mega Bytes), '1067KB' (Kilo Bytes), '5000B' (Bytes)
13+
$config['grocery_crud_file_upload_list_image_preview'] = true; // allow preview uploads on list fields if are images
14+
$config['grocery_crud_file_upload_edit_image_preview'] = true; // allow preview uploads on edit/add if are images
15+
$config['grocery_crud_file_upload_view_image_preview'] = true; // allow preview uploads field at the view-only cases
1316

1417
// You can choose 'ckeditor','tinymce' or 'markitup'
1518
$config['grocery_crud_default_text_editor'] = 'ckeditor';

application/libraries/Grocery_CRUD.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ protected function change_list_value($field_info, $value = null)
345345
$file_url = base_url().$field_info->extras->upload_path."/$value";
346346

347347
$file_url_anchor = '<a href="'.$file_url.'"';
348-
if($is_image)
348+
if($is_image && $this->config->grocery_crud_file_upload_list_image_preview)
349349
{
350350
$file_url_anchor .= ' class="image-thumbnail"><img src="'.$file_url.'" height="50px">';
351351
}
@@ -2786,6 +2786,7 @@ protected function get_upload_file_input($field_info, $value)
27862786
? true : false;
27872787

27882788
$image_class = $is_image ? 'image-thumbnail' : '';
2789+
$preview_file = $is_image && $this->config->grocery_crud_file_upload_edit_image_preview ? true : false;
27892790

27902791
$input = '<span class="fileinput-button qq-upload-button" id="upload-button-'.$unique.'" style="'.$uploader_display_none.'">
27912792
<span>'.$this->l('form_upload_a_file').'</span>
@@ -2800,7 +2801,7 @@ protected function get_upload_file_input($field_info, $value)
28002801
$input .= "<div id='uploader_$unique' rel='$unique' class='grocery-crud-uploader' style='$uploader_display_none'></div>";
28012802
$input .= "<div id='success_$unique' class='upload-success-url' style='$file_display_none padding-top:7px;'>";
28022803
$input .= "<a href='".$file_url."' id='file_$unique' class='open-file";
2803-
$input .= $is_image ? " $image_class'><img src='".$file_url."' height='50px'>" : "' target='_blank'>$value";
2804+
$input .= $preview_file ? " $image_class'><img src='".$file_url."' height='50px'>" : "' target='_blank'>$value";
28042805
$input .= "</a> ";
28052806
$input .= "<a href='javascript:void(0)' id='delete_$unique' class='delete-anchor'>".$this->l('form_upload_delete')."</a> ";
28062807
$input .= "</div><div style='clear:both'></div>";
@@ -4572,6 +4573,9 @@ protected function _initialize_variables()
45724573
$this->config->default_per_page = $ci->config->item('grocery_crud_default_per_page');
45734574
$this->config->file_upload_allow_file_types = $ci->config->item('grocery_crud_file_upload_allow_file_types');
45744575
$this->config->file_upload_max_file_size = $ci->config->item('grocery_crud_file_upload_max_file_size');
4576+
$this->config->grocery_crud_file_upload_list_image_preview = $ci->config->item('grocery_crud_file_upload_list_image_preview');
4577+
$this->config->grocery_crud_edit_upload_list_image_preview = $ci->config->item('grocery_crud_file_upload_edit_image_preview');
4578+
$this->config->grocery_crud_view_upload_list_image_preview = $ci->config->item('grocery_crud_file_upload_view_image_preview');
45754579
$this->config->default_text_editor = $ci->config->item('grocery_crud_default_text_editor');
45764580
$this->config->text_editor_type = $ci->config->item('grocery_crud_text_editor_type');
45774581
$this->config->character_limiter = $ci->config->item('grocery_crud_character_limiter');

0 commit comments

Comments
 (0)