ish_manager 0.1.8.16 → 0.1.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d7a5efa748af33d04272ad3ea8453725dfbbe3
-  data.tar.gz: 2f0e847d27566f93664857e32f40b13adaaba2b5
+  metadata.gz: 693f4c7000897e29edddc01f32b3cf931f3cb536
+  data.tar.gz: df2e55471622d9db7115257fd773bd4a6b02fb3f
 SHA512:
-  metadata.gz: cccb773a4decdd75d17a6a4bba2ac0b7240a85fcb42c253d38561282e574f3adc9c987caf1bb3bb3f130c8dc865d9a01d115b406e63d5ec1c464a68d6af4a839
-  data.tar.gz: ea14c441565312e53d910e6a68436bd3cf46eab8197d0a27664357402782c743d1b1220375a1103624cab188a101708f61683619fb96ce79df0a1a8b237239bb
+  metadata.gz: e3739f3c9abbdf6c4430af352a1876e1aeae88f24e77fba1668080c02a835327052f1b7469c60b0a0d37eef546f8ea98e1337beb47fc5db0a914637d155646a1
+  data.tar.gz: 5de14e8ba68634674e189cadcdaecc7fcc7ea086a062b545c249e628d1651792173f2bec0bd4d8c2ec07b6d8bd961494527a599537bb7c8b5a9b6b93cd480c7a

data/app/controllers/ish_manager/application_controller.rb

@@ -23,6 +23,7 @@ module IshManager
       @galleries_list = Gallery.all.list
       @videos_list = Video.all.list
       @user_profiles_list = IshModels::UserProfile.all.list
+      @tags_list = Tag.all.list
     end
 
   end

data/app/controllers/ish_manager/reports_controller.rb

@@ -1,12 +1,11 @@
 
 class IshManager::ReportsController < IshManager::ApplicationController
 
-  # before_filter :authenticate_user!
-  # before_filter :set_lists
+  before_action :set_lists
 
   def index
     authorize! :index, Report
-    @reports = Report.unscoped.where( :is_trash => false ).page( params[:reports_page] ).per( Report::PER_PAGE )
+    @reports = Report.unscoped.order_by( :created_at => :desc ).where( :is_trash => false ).page( params[:reports_page] ).per( Report::PER_PAGE )
     if false === params[:site]
       @reports = @reports.where( :site_id => nil )
     end
@@ -23,10 +22,12 @@ class IshManager::ReportsController < IshManager::ApplicationController
 
   def edit
     @report = Report.unscoped.find params[:id]
+    authorize! :edit, @report
   end
 
   def destroy
     @report = Report.unscoped.find params[:id]
+    authorize! :destroy, @report
     @report.is_trash = true
     @report.save
     redirect_to request.referrer
@@ -40,7 +41,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
     photo = Photo.new
     photo.photo = params[:report][:photo]
     photo.report_id = @report.id
-    photo.user = @report.user
+    # photo.user = @report.user
     photo.is_public = @report.is_public
     photo.is_trash = false
     photo.save
@@ -48,9 +49,9 @@ class IshManager::ReportsController < IshManager::ApplicationController
     params[:report][:photo] = nil
 
     respond_to do |format|
-      if @report.update_attributes(params[:report].permit( :name, :subhead, :descr, :venue, :city, :x, :y, :tag, :is_public, :photo, :site, :site_id ))
+      if @report.update_attributes(params[:report].permit!)
         format.html do
-          redirect_to manager_report_path(@report), :notice => 'Report was successfully updated.'
+          redirect_to report_path(@report), :notice => 'Report was successfully updated.'
         end
         format.json { head :ok }
       else
@@ -60,5 +61,89 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
+  def new
+    @report = Report.new
+    authorize! :new, @report
+    @tags_list = Tag.all.where( :is_public => true ).list
+    @sites_list = Site.all.list
+    @cities_list = City.all.list
+    @venues_list = Venue.all.list
+
+    respond_to do |format|
+      format.html do
+        render
+      end
+      format.json { render :json => @report }
+    end
+  end
+
+  def create
+    @report = Report.new params[:report].permit!
+    authorize! :create, @report
+
+    @site = Site.where( :id => params[:report][:site_id] ).first
+    @site ||= Site.find_by :domain => 'piousbox.com', :lang => :en 
+
+    # @report.user = @current_user || User.where( :username => 'anon' ).first
+    # @report.username = @report.user.username
+    @report[:lang] = @locale
+    @report.name_seo ||= @report.id
+    @report.is_feature = false
+    @report.site = @site
+
+    saved = false
+    verified = true # verify_recaptcha( :model => @report, :message => 'There is a problem with recaptcha.' ) # @TODO: what this
+    if Rails.env.development?
+      verified = true
+    end
+
+    if verified
+      saved = @report.save
+    end
+
+    respond_to do |format|
+      if saved
+
+        # photo
+        photo = Photo.new 
+        photo.photo = params[:report][:photo]
+        # photo.user = @report.user
+        photo.is_public = @report.is_public
+        photo.is_trash = false
+        photo.report_id = @report.id
+        photo.save
+
+        # for homepage
+        if @report.is_public
+          n = Newsitem.new
+          n.report = @report
+          n.descr = @report.name + ' ' + @report.subhead
+          # n.user = @report.user
+          @site.newsitems << n
+          if @site.save
+            ;
+          else
+            flash[:error] = (flash[:error]||'') + 'City could not be saved (newsitem). '
+          end
+        end
+
+        format.html do
+          redirect_to reports_path, :notice => 'Report was successfully created (but newsitem, no information).' 
+        end
+        format.json { render :json => @report, :status => :created, :location => @report }
+      else
+        format.html do
+          flash[:error] = @report.errors.inspect
+          @tags_list = Tag.all.where( :is_public => true ).list
+          @sites_list = Site.all.list
+          @cities_list = City.all.list
+
+          render :action => "new"
+        end
+        format.json { render :json => @report.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
 end
 

data/app/views/ish_manager/reports/#index.haml#

@@ -0,0 +1,28 @@
+
+.row
+  .large-12.columns
+    %h3
+      Reports Index (#{@reports.length})
+      - if @site
+        In #{@site.domain}/#{@site.lang}
+      = link_to '[+]', new_report_path
+    = paginate @reports, :param_name => :reports_page
+    
+    %ol
+      - @reports.each do |report|
+        %li
+          = link_to '[~]', edit_report_path( report )
+          = link_to '[x]', report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          - if report.is_public
+            [public ]
+          - else
+            [private]
+          = link_to report.name, report_path( report )
+          %br
+          .gray
+            - if report.site
+              Site #{report.site.domain}/#{report.site.lang}
+            %br
+            = report.created_at
+    = paginate @reports, :param_name => :reports_page
+    

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

@@ -1,18 +1,24 @@
 
-- url ||= manager_reports_path
-= form_for @report, :url => url, :html => { :multipart => true } do |f|
+- url ||= reports_path
+= form_for report, :url => url, :html => { :multipart => true } do |f|
 
-  - if @report.errors.any?
+  - if report.errors.any?
     #error_explanation
       %h3= t('e.there_are_errors')
 
       %ul
-        - @report.errors.full_messages.each do |msg|
+        - report.errors.full_messages.each do |msg|
           %li= msg
 
-  .name= f.text_field :name
-  .subhead= f.text_area :subhead
-  .descr= f.text_area :descr, :class => 'tinymce'
+  .field
+    = f.label :name
+    = f.text_field :name
+  .field
+    = f.label :subhead
+    = f.text_area :subhead
+  .field
+    = f.label :descr
+    .descr= f.text_area :descr, :class => 'tinymce'
 
   .row
     .large-6.columns
@@ -36,7 +42,7 @@
 
       = f.file_field :photo
 
-      = recaptcha_tags
+      -# = recaptcha_tags
 
       = f.submit
       

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

@@ -1,6 +1,6 @@
 
 .row
   .large-12.columns
-    %h1= t 'reports.edit'
+    %h1 Edit Report #{@report.name}
 
-    = render 'form', :url => manager_report_path(@report.id)
+    = render 'form', :url => report_path(@report.id), :report => @report

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

@@ -5,6 +5,7 @@
       Reports Index (#{@reports.length})
       - if @site
         In #{@site.domain}/#{@site.lang}
+      = link_to '[+]', new_report_path
     = paginate @reports, :param_name => :reports_page
     
     %ol
@@ -21,6 +22,7 @@
           .gray
             - if report.site
               Site #{report.site.domain}/#{report.site.lang}
-
+            %br
+            = report.created_at
     = paginate @reports, :param_name => :reports_page
     

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

@@ -1,5 +1,5 @@
 
 .row
-  .large-12.columns
-    %h2= t('reports.new')
-    = render 'reports/form'
+  .col-sm-12
+    %h2.center New Report
+    = render 'ish_manager/reports/form', :report => @report

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

@@ -2,7 +2,9 @@
 .manager-reports-show
   .row
     .large-12.columns
-      %h1= @report.name
+      %h1
+        = @report.name
+        = link_to '[~]', edit_report_path( @report )
 
       .meta
         -# By #{link_to @report.user_profile.username, user_path( @report.user )}

data/app/views/layouts/ish_manager/application.haml

@@ -12,10 +12,13 @@
   %body
     .bg-white
       = render :partial => 'ish_manager/application/main_header'
-      - if notice
-        %p.notice= notice
-      - if alert
-        %p.alert= alert
+      .container
+        .row
+          .col-sm-12
+            - if notice
+              %p.notice= notice
+            - if alert
+              %p.alert= alert
       .container
         = yield
     = render :partial => 'ish_manager/application/main_footer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.16
+  version: 0.1.8.18
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,6 +208,7 @@ files:
 - app/views/ish_manager/photos/_multinew.haml~
 - app/views/ish_manager/photos/show.haml
 - app/views/ish_manager/photos/without_gallery.haml
+- app/views/ish_manager/reports/#index.haml#
 - app/views/ish_manager/reports/_form.haml
 - app/views/ish_manager/reports/_index.haml
 - app/views/ish_manager/reports/edit.haml