ish_manager 0.1.8.251 → 0.1.8.255

data/app/assets/stylesheets/ish_manager/user_profiles.scss

@@ -6,4 +6,4 @@
   ul li {
     list-style-type: circle;
   }
-}
+}

data/app/assets/stylesheets/ish_manager/utils.scss

@@ -14,13 +14,13 @@ ul:not(.browser-default).bullets, {
   align-content: flex-start;
 
   height: 3em;
-  line-height: 3em; 
+  line-height: 3em;
 
   width: 100%;
-  margin: 0 0 1em 0;
+  margin: 1em 0 0 0;
   padding: 0;
 
   > * {
     padding-right: 1em;
   }
-}
+}

data/app/assets/stylesheets/ish_manager/videos.scss

@@ -0,0 +1,6 @@
+
+.videos--index {
+  .item {
+    margin-bottom: 3em;
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -26,15 +26,15 @@ module IshManager
 
     def set_lists
       @cities_list = City.list
+      @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list
+      @maps_list = ::Gameui::Map.list
+      @reports_list = Report.all.list
       @sites_list = Site.all.list
+      @tags_list = Tag.list
+      @user_profiles_list = IshModels::UserProfile.all.list
       @venues_list = Venue.all.list
-
-      @reports_list = Report.all.list
-      @galleries_list = Gallery.all.list
       @videos_list = Video.all.list
-      @user_profiles_list = IshModels::UserProfile.all.list
-      @tags_list = Tag.list
     end
 
     def access_denied exception

data/app/controllers/ish_manager/features_controller.rb

@@ -2,7 +2,7 @@
 class IshManager::FeaturesController < IshManager::ApplicationController
 
   before_action :set_lists
-  
+
   def new
     if params[:city_id]
       @city = City.find params[:city_id]
@@ -70,7 +70,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
       @feature = @tag.features.find params[:id]
       authorize! :edit_feature, @tag
     end
-   
+
     if params[:venue_id]
       @venue = Tag.find params[:venue_id]
       @feature = @venue.features.find params[:id]
@@ -81,13 +81,13 @@ class IshManager::FeaturesController < IshManager::ApplicationController
 
   def update
     unless params[:city_id].blank?
-      @city = City.find params[:city_id] 
+      @city = City.find params[:city_id]
       authorize! :update_feature, @city
       @feature = @city.features.find params[:id]
       redirect_path = city_path( @city )
     end
     unless params[:site_id].blank?
-      @site = Site.find params[:site_id] 
+      @site = Site.find params[:site_id]
       authorize! :update_feature, @site
       @feature = @site.features.find params[:id]
       redirect_path = site_path( @site )
@@ -98,7 +98,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
       @feature = @tag.features.find params[:id]
       redirect_path = tag_path( @tag )
     end
-    
+
     authorize! :update, @feature
 
     if @feature.update_attributes params[:feature].permit!
@@ -111,7 +111,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
     else
       flash[:alert] = 'No Luck. ' + @feature.errors.messages
       render :action => :edit
-    end    
+    end
   end
 
   def index
@@ -145,6 +145,6 @@ class IshManager::FeaturesController < IshManager::ApplicationController
     end
     redirect_to request.referrer
   end
-  
+
 end
 

data/app/controllers/ish_manager/galleries_controller.rb

@@ -83,7 +83,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def show
     begin
-      @gallery = Gallery.unscoped.find_by :galleryname => params[:id]
+      @gallery = Gallery.unscoped.find_by :slug => params[:id]
     rescue
       @gallery = Gallery.unscoped.find params[:id]
     end

data/app/controllers/ish_manager/maps_controller.rb

@@ -5,8 +5,8 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def index
     authorize! :index, ::Gameui::Map
-    @maps = ::Gameui::Map.where( parent_slug: "" )
-    @all_maps = Gameui::Map.all
+    @maps = ::Gameui::Map.where( parent_slug: "" ).order( slug: :asc )
+    @all_maps = Gameui::Map.all.order( slug: :asc )
   end
 
   def show
@@ -54,6 +54,8 @@ class IshManager::MapsController < IshManager::ApplicationController
       @map.image = image
     end
 
+    @map.config = JSON.parse map_params[:config]
+
     respond_to do |format|
       if map_params[:parent_slug].present?
         @map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })

data/app/controllers/ish_manager/markers_controller.rb

@@ -4,12 +4,6 @@ class IshManager::MarkersController < IshManager::ApplicationController
   before_action :set_map, except: [ :destroy, :edit, :update ]
   before_action :set_marker, only: [ :edit, :update ]
 
-=begin
-  def index
-    authorize! :markers, ::Gameui::Map
-  end
-=end
-
   def new
     authorize! :new_marker, ::Gameui::Map
     @marker = ::Gameui::Marker.new
@@ -59,7 +53,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
     respond_to do |format|
       if @marker.update(marker_params)
         @marker.map.touch
-        format.html { redirect_to maps_path(@map), notice: 'Marker was successfully updated.' }
+        format.html { redirect_to location_map_editor_path(@map.id), notice: 'Marker was successfully updated.' }
       else
         format.html { render :edit }
       end

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -1,28 +1,7 @@
 class IshManager::NewsitemsController < IshManager::ApplicationController
   before_action :set_lists
 
-  def new
-    @newsitem = Newsitem.new
-
-    @cities_list   = City.list
-    @maps_list     = ::Gameui::Map.list
-    @sites_list    = Site.list
-    @tags_list     = Tag.list
-
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @newsitem.city = @city
-    end
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @newsitem.site = @site
-    end
-    if params[:tag_id]
-      @tag = Tag.unscoped.find params[:tag_id]
-      @newsitem.tag = @tag
-    end
-    authorize! :new, @newsitem
-  end
+  ## Alphabetized : )
 
   def create
     @newsitem = Newsitem.new params[:newsitem].permit!
@@ -35,6 +14,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
     @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
     @resource.newsitems << @newsitem
+    @resource.touch
 
     authorize! :create_newsitem, @resource
 
@@ -46,13 +26,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     url = case @resource.class.name
     when "City"
       edit_city_path( @resource.id )
+    when "IshModels::UserProfile"
+      user_profiles_path
+    when "Site"
+      edit_site_path( @resource.id )
     when "Tag"
       @resource.site.touch
       tag_path( @resource.id )
-    when "Site"
-      edit_site_path( @resource.id )
-    when "IshModels::UserProfile"
-      user_profiles_path
     else
       root_path
     end
@@ -72,103 +52,84 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   end
 
   def destroy
-    authorize! :destroy, Newsitem
-    if params[:city_id]
-      flag = City.find( params[:city_id] ).newsitems.find( params[:id] ).destroy
-      url = edit_city_path( params[:city_id] )
+    @newsitem = Newsitem.find params[:id]
+    authorize! :destroy, @newsitem
+
+    if @newsitem.destroy
+      City.find(@newsitem.city_id).touch if @newsitem.city_id
+      Site.find(@newsitem.site_id).touch if @newsitem.site_id
+      Tag.find(@newsitem.tag_id).touch if @newsitem.tag_id
+
+      flash[:notice] = "Destroyed the newsitem."
+    else
+      flash[:alert] = "Cannot destroy the newsitem: #{@newsitem.errors.full_messages}."
     end
-    if profile_id = params[:user_profile_id]
-      profile = IshModels::UserProfile.find profile_id
-      flag = profile.newsitems.find( params[:id] ).destroy
-      url = profile_path( profile_id )
+
+    redirect_to request.referrer ? request.referrer : '/'
+  end
+
+  def edit
+    @newsitem = Newsitem.find( params[:id] )
+    authorize! :edit, @newsitem
+
+    ## @TODO: what on earth is this?
+    out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
+    @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
+
+  end
+
+  def index
+    @resource = Site.find( params[:site_id] ) if params[:site_id]
+    @resource = City.find( params[:site_id] ) if params[:city_id]
+
+    authorize! :newsitems_index, @resource
+    @newsitems = @resource.newsitems
+  end
+
+  def new
+    @newsitem = Newsitem.new
+
+    if params[:city_id]
+      @city = City.find params[:city_id]
+      @newsitem.city = @city
     end
     if params[:site_id]
-      site = Site.find( params[:site_id] )
-      flag = site.newsitems.find( params[:id] ).destroy
-      if flag
-        site.touch
-      end
-      url = edit_site_path( params[:site_id] )
+      @site = Site.find params[:site_id]
+      @newsitem.site = @site
     end
     if params[:tag_id]
-      tag = Tag.find( params[:tag_id] )
-      flag = tag.newsitems.find( params[:id] ).destroy
-      url = tag_path( params[:tag_id] )
+      @tag = Tag.unscoped.find params[:tag_id]
+      @newsitem.tag = @tag
     end
-
-    flash[:notice] = "Success? #{flag.inspect}"
-    redirect_to request.referrer ? request.referrer : '/'
+    authorize! :new, @newsitem
   end
 
   def update
-    if params[:site_id] || params[:newsitem][:site_id]
-      if params[:site_id]
-        @site = Site.find params[:site_id]
-      end
-      if params[:newsitem][:site_id]
-        @site = Site.find params[:newsitem][:site_id]
-      end
-      @site.touch
-      @newsitem = @site.newsitems.find params[:id]
-      url = edit_site_path( @site )
-    end
+    @newsitem = Newsitem.find params[:id]
+    authorize! :update, @newsitem
+
+    ## @TODO: re-add site management here, probably.
 
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem = @city.newsitems.find params[:id]
       url = edit_city_path( @city )
     end
+
     if params[:photo]
       photo = Photo.new :photo => params[:photo]
       photo.user_profile = current_user.profile
       @newsitem.photo = photo
     end
-    authorize! :update, @newsitem
-    flag = @newsitem.update_attributes params[:newsitem].permit!
 
+    flag = @newsitem.update_attributes params[:newsitem].permit!
     if flag
       flash[:notice] = 'Success'
     else
       flash[:alert] = "No Luck: #{@newsitem.errors.messages}"
     end
 
-    redirect_to url
-  end
-
-  def edit
-    out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
-    @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
-
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @newsitem = @site.newsitems.find( params[:id] )
-    end
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @newsitem = @city.newsitems.find( params[:id] )
-    end
-    authorize! :edit, @newsitem
-
-  end
-
-  def index
-    @resource = Site.find( params[:site_id] ) if params[:site_id]
-    @resource = City.find( params[:site_id] ) if params[:city_id]
-
-    authorize! :newsitems_index, @resource
-    @newsitems = @resource.newsitems
-  end
-
-  private
-
-  def set_lists
-    @videos_list    = Video.list
-    @galleries_list = Gallery.list
-    @reports_list   = Report.list
-    @sites_list     = Site.list
-    @cities_list    = City.list
-    @tags_list      = Tag.list
-    @user_profiles_list = IshModels::UserProfile.list
+    redirect_to edit_newsitem_path(@newsitem)
   end
 
 end

data/app/controllers/ish_manager/photos_controller.rb

@@ -30,12 +30,12 @@ class IshManager::PhotosController < IshManager::ApplicationController
 
   def j_create
     # find this gallery
-    if params[:galleryname]
-      gallery = Gallery.unscoped.where( :galleryname => params[:galleryname] ).first
-      gallery ||= Gallery.unscoped.find params[:galleryname]
+    if params[:slug]
+      gallery = Gallery.unscoped.where( :slug => params[:slug] ).first
+      gallery ||= Gallery.unscoped.find params[:slug]
     elsif params[:gallery_id] # this one, let's normalize on id everywhere in manager.
       gallery = Gallery.unscoped.find( params[:gallery_id] )
-      gallery ||= Gallery.unscoped.where( :galleryname => params[:gallery_id] ).first
+      gallery ||= Gallery.unscoped.where( :slug => params[:gallery_id] ).first
     end
     authorize! :create_photo, gallery
 

data/app/controllers/ish_manager/reports_controller.rb

@@ -3,11 +3,48 @@ class IshManager::ReportsController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  def create
+    @report = Report.new params[:report].permit!
+    @report.user_profile = current_user.profile # @TODO: this should not be hard-coded
+    authorize! :create, @report
+
+    flag = @report.save
+    respond_to do |format|
+      if flag
+
+        ## @TODO: I'm sure there is a better way
+        if params[:report][:photo]
+          photo = Photo.new
+          photo.photo = params[:report][:photo]
+          photo.is_public = @report.is_public
+          photo.is_trash = false
+          photo.report_id = @report.id
+          photo.save
+        end
+
+        format.html do
+          redirect_to report_path(@report), :notice => 'Report was successfully created.'
+        end
+        format.json { render :json => @report, :status => :created, :location => @report } # TODO: remove, I got the api now.
+      else
+        format.html do
+          flash[:alert] = @report.errors.full_messages
+          @tags_list = Tag.all.list
+          @sites_list = Site.all.list
+          @cities_list = City.all.list
+
+          render :action => "new"
+        end
+        format.json { render :json => @report.errors, :status => :unprocessable_entity } # @TODO: remove, right? no api here.
+      end
+    end
+  end
+
   def index
     authorize! :index, Report
-    @reports = Report.unscoped.order_by( :created_at => :desc 
+    @reports = Report.unscoped.order_by( :created_at => :desc
                                        ).where( :is_trash => false, :user_profile => current_user.profile
-                                              ).page( params[:reports_page] 
+                                              ).page( params[:reports_page]
                                                     ).per( Report::PER_PAGE )
     if false === params[:site]
       @reports = @reports.where( :site_id => nil )
@@ -74,76 +111,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
     end
   end
 
-  def create
-    @report = Report.new params[:report].permit!
-    @report.user_profile = current_user.profile
-    authorize! :create, @report
-
-    @site = Site.where( :id => params[:report][:site_id] ).first
-    @site ||= Site.find_by :domain => 'piousbox.com', :lang => :en 
-
-    if @site
-      redirect_path = site_reports_path( @site.id )
-    end
-    if params[:report][:city_id]
-      redirect_path = city_path( params[:report][:city_id] )
-    end
-
-    # @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 = @report.save
-
-    respond_to do |format|
-      if saved
-
-        if params[:report][:photo]
-          # 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
-        end
-        
-        # for homepage
-        # @TODO: move this to the model
-        if @report.is_public
-          n = Newsitem.new
-          n.report = @report
-          n.descr = @report.subhead
-          # n.user = @report.user
-          @site.newsitems << n
-          @site.touch
-          if @site.save
-          else
-            flash[:alert] = (flash[:alert]||'') + 'City could not be saved (newsitem). '
-          end
-        end
-
-        format.html do
-          redirect_to redirect_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[:alert] = @report.errors.messages
-          @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/controllers/ish_manager/tags_controller.rb

@@ -3,6 +3,39 @@ class IshManager::TagsController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  # alphabetized : )
+
+  def create
+    @tag = Tag.create params[:tag].permit!
+    authorize! :create, @tag
+    if @tag.save
+      do_touch
+      flash[:notice] = 'Success.'
+      redirect_to tags_path
+    else
+      puts! @tag.errors, "error creating tag."
+      flash[:alert] = "No luck. #{@tag.errors.full_messages}"
+      render action: 'new'
+    end
+  end
+
+  def destroy
+    @tag = Tag.unscoped.find params[:id]
+    authorize! :destroy, @tag
+    if @tag.destroy
+      do_touch
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "Cannot destroy tag: #{@tag.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def edit
+    @tag = Tag.unscoped.find params[:id]
+    authorize! :edit, @tag
+  end
+
   def index
     @resource = City.find( params[:city_id] ) if params[:city_id]
 
@@ -14,16 +47,8 @@ class IshManager::TagsController < IshManager::ApplicationController
 
     authorize! :index, Tag.new
 
-    @site = Site.find( params[:site_id] ) if params[:site_id] 
-    @city = City.find( params[:city_id] ) if params[:city_id] 
-  end
-  
-  def show
-    @tag = Tag.unscoped.find params[:id]
-    authorize! :show, @tag
-
-    @galleries = @tag.galleries.unscoped.where( :is_trash => false ).page( params[:galleries_page] ).per( 10 )
-    @videos = @tag.videos.unscoped.where( :is_trash => false ).page( params[:videos_page ]).per( 10 )
+    @site = Site.find( params[:site_id] ) if params[:site_id]
+    @city = City.find( params[:city_id] ) if params[:city_id]
   end
 
   def new
@@ -31,23 +56,12 @@ class IshManager::TagsController < IshManager::ApplicationController
     authorize! :new, @tag
   end
 
-  def create
-    @tag = Tag.create params[:tag].permit!
-    authorize! :create, @tag
-    if @tag.save
-      do_touch
-      flash[:notice] = 'Success.'
-      redirect_to tags_path
-    else
-      puts! @tag.errors, "error creating tag."
-      flash[:alert] = "No luck. #{@tag.errors.messages}" 
-      render :action => :new
-    end
-  end
-
-  def edit
+  def show
     @tag = Tag.unscoped.find params[:id]
-    authorize! :edit, @tag
+    authorize! :show, @tag
+
+    @galleries = @tag.galleries.unscoped.where( :is_trash => false ).page( params[:galleries_page] ).per( 10 )
+    @videos = @tag.videos.unscoped.where( :is_trash => false ).page( params[:videos_page ]).per( 10 )
   end
 
   def update
@@ -64,17 +78,6 @@ class IshManager::TagsController < IshManager::ApplicationController
     end
   end
 
-  def destroy
-    @tag = Tag.unscoped.find params[:id]
-    authorize! :destroy, @tag
-    if @tag.destroy
-      do_touch
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = "Cannot destroy tag: #{@tag.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
 
   private
 

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -22,11 +22,17 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     @profile = IshModels::UserProfile.find params[:id]
     authorize! :update, @profile
 
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @profile.profile_photo = photo
+    end
+
     flag = @profile.update_attributes params[:profile].permit!
+
     if flag
       flash[:notice] = "Updated profile #{@profile.email}"
     else
-      flash[:alert] = "Cannot update profile: #{pp_errors @profile.errors.messages}"
+      flash[:alert] = "Cannot update profile: #{@profile.errors.full_messages}"
     end
     if params[:redirect_to]
       redirect_to params[:redirect_to]
@@ -45,6 +51,12 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     @user.password ||= (0...12).map { rand(100) }.join
     @user.profile = IshModels::UserProfile.new params[:profile].permit!
     authorize! :create, @user.profile
+
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @profile.profile_photo = photo
+    end
+
     if !@user.save
       raise "cannot save profile.user: #{@profile.user.errors.full_messages} profile errors: #{@profile.errors.full_messages}"
     end

data/app/mailers/ish_manager/application_mailer.rb

@@ -20,7 +20,7 @@ module IshManager
       @gallery        = gallery
       @domain         = Rails.application.config.action_mailer.default_url_options[:host]
       @galleries_path = IshManager::Engine.routes.url_helpers.galleries_path
-      @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.galleryname)
+      @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
       mail( :to => '314658@gmail.com',
             :bcc => profiles.map { |p| p.email },
             :subject => 'You got new shared galleries on pi manager' ).deliver