diff --git a/Dockerfile b/Dockerfile index 113fd4a46..d536ef467 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN echo -e “$(hostname -i)\t$(hostname) $(hostname).localhost” >> /etc/host WORKDIR /app COPY . /app RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html -RUN chmod 775 /app/public/uploads && chown -R www-data:www-data /app/public/uploads +RUN chmod 755 /app/public/uploads && chown -R www-data:www-data /app/public/uploads RUN cp application/config/database.php.tmpl application/config/database.php && \ sed -i -e "s/\(localhost\)/web/g" test/ospos.js && \ diff --git a/application/controllers/Items.php b/application/controllers/Items.php index 96cf176ac..39c93e5f6 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -190,8 +190,11 @@ class Items extends Secure_Controller $data['selected_supplier'] = $item_info->supplier_id; $data['logo_exists'] = $item_info->pic_id != ''; - $images = glob('./uploads/item_pics/' . $item_info->pic_id . '.*'); - $data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : ''; + if (!empty($item_info->pic_id)) + { + $images = glob('./uploads/item_pics/' . $item_info->pic_id . '.*'); + $data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : ''; + } $stock_locations = $this->Stock_location->get_undeleted_all()->result_array(); foreach($stock_locations as $location)