ish_manager 0.1.8.33 → 0.1.8.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6632b14e4f481e7ff53f96df5614fef857f9a7d3
-  data.tar.gz: 55e69a6d9dd528ddb53c0f95dbb1cf1b11ac5087
+  metadata.gz: 86334fc75c5dbee29794846fc94f18b672d23b4b
+  data.tar.gz: f5e5dada0dc5d5d365bce2eb76161a5b8d562442
 SHA512:
-  metadata.gz: 676d24598fe531e4a5c696c01a248ff032ea02e35924526a63192adbeffc5de99506130d74d42b10cfb56ad96e8bfb490c6f26c319018511b91fa11f2f07fce3
-  data.tar.gz: 0d4b9b341ce4c2b4f9df4687ed31264cc5ef932e8cd43861ec5eaaaf53b3d8a4bee015fbef41da639e5870bb859392c53f7c293fb49ac1758b925ef7417232d5
+  metadata.gz: 428b6106487c9521d72238458741f421a7e2365885abfbe4775e1aa4d2dbdebdc53cca5ccfc0d0369ed15d8c6a2585f9ed3a89553a304464942d63af3833e65e
+  data.tar.gz: 21006383d18c10feefe7cd6747d8432d9c9fae653f783fd376b1d5ef3415415e7328ab0d70e549d054b0159a807e0267a111428578b4f0c4c2f4442e71cc4143

data/app/assets/stylesheets/ish_manager/application.css

@@ -84,3 +84,14 @@ hr {
 }
 nav.pagination
 */
+
+/**
+ * reports
+ */
+.descr {
+  border: 1px solid yellow;
+  padding: 1em;
+}
+.descr .float-left {
+  padding-right: 1em;
+}

data/app/controllers/ish_manager/reports_controller.rb

@@ -40,16 +40,11 @@ class IshManager::ReportsController < IshManager::ApplicationController
     @report = Report.unscoped.find params[:id]
     authorize! :update, @report
 
-    # photo
-    photo = Photo.new
-    photo.photo = params[:report][:photo]
-    photo.report_id = @report.id
-    # photo.user = @report.user
-    photo.is_public = @report.is_public
-    photo.is_trash = false
-    photo.save
-    @report.photo = photo
-    params[:report][:photo] = nil
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @report.photo = photo
+      @report.save
+    end
 
     respond_to do |format|
       if @report.update_attributes(params[:report].permit!)

data/app/views/ish_manager/reports/_form.haml

@@ -46,7 +46,10 @@
       %p
         = f.check_box :is_public
         = f.label :is_public
+      
+      = file_field_tag :photo
+      - begin
+        = image_tag report.photo.photo.url(:thumb)
+      - rescue
         
-      = f.file_field :photo
-
       = f.submit 'Submit'

data/app/views/ish_manager/reports/show.haml

@@ -17,4 +17,10 @@
 
       - if @report.subhead.length > 3
         .subhead= @report.subhead
-      .descr= raw @report.descr
+        
+      .descr
+        - if @report.photo
+          .float-left= image_tag @report.photo.photo.url( :small )
+        = raw @report.descr
+
+      .clearfix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.33
+  version: 0.1.8.34
 platform: ruby
 authors:
 - piousbox