ish_manager 0.1.8.257 → 0.1.8.258

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b660106cd844ab90b5803fd365df05e8d61fd3af1814ef776f593361daee27f
-  data.tar.gz: 158d6293c36c5386b67bd080968530588d987e57c9fdf681693cf56b6a44bbd2
+  metadata.gz: e880865158238e4e853e2ff014bcdf33d2f7a34c090d340e1444215c1445b204
+  data.tar.gz: c52428e4febc8b285e8eecdeed98734f1dc40da6fb28eb8c98f43a7f507fada0
 SHA512:
-  metadata.gz: e230441cad9274a3ed7487b7fb2d8f7f2195dca79e910bfa85899d2b4f98faace4e82f7d44939e4a4bc744dcb0a50e7390db77b349f3cb72e168cf05e17c7c69
-  data.tar.gz: 4a8f0c327ab53d6fae4d4b14bfedb7db501f7cec920d74aa11cfa7fdffe09860674526930f4e13c33c63744d2452b849d459687600018415a65b65874dd4939b
+  metadata.gz: 10819c852f56a077077691f454b7894ceff83a6bfc0e0e7b6838fe9c86480b4a19e901f9513249f543c353ea87828591a4739b276eebdb80e3766f68d89b141d
+  data.tar.gz: e13e3aeedddfee4f4c798ef1350aa11a8f25d61c035bd923e1aa72f5c9a9cd332db63150f4b624ea3e786b891c75207eb72644d718d3d2af7615b3d02ef3b9d8

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

@@ -61,6 +61,14 @@ pre {
   padding: 1em;
 }
 
+.bordered {
+  border: 1px solid grey;
+  padding: .5em;
+  border-radius: 8px;
+  margin-bottom: .5em;
+}
+
+
 /* C */
 
 .center {

data/app/models/ish_manager/ability.rb

@@ -66,6 +66,11 @@ class IshManager::Ability
       if user.profile && :manager == user.profile.role_name
         can [ :create_newsitem, :show, :new_feature, :create_feature,
          :index, :new, :create, :edit, :update ], City
+
+         can [ :edit, :index, :show, :update,
+               :new_marker, :edit_marker, :create_marker, :update_marker,
+         ], Gameui::Map
+
       end
 
 

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

@@ -10,8 +10,9 @@
               %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
               %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
               %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-              %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
+              %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
           %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }= link_to 'GameUi::Maps', maps_path
             %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
             %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
             %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path

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

@@ -21,13 +21,15 @@
   %p.addToggle Markers (#{@map.markers.count}) [<>]
   .markers-list
     - @map.markers.each do |marker|
-      .item
+      .flex-row.bordered
+        = image_tag marker.image.image.url(:original)
         .flat-row
           .a= marker.slug
           .a= button_to '~', edit_marker_path(marker), method: :get
           .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
           .a= link_to '[api]', api_marker_path(marker)
           .a= link_to '[this map]', edit_map_path(marker.slug)
+      .hide
         %ul.bullets
           %li <b>item_type:</b> #{marker.item_type}
 

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

@@ -35,7 +35,7 @@
           = f.label :image
           = file_field_tag :image
           .image-thumb
-            = image_tag(@marker.image.image.url(:thumb)) rescue nil
+            = image_tag(@marker.image.image.url(:original)) rescue nil
             = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
       .col.s3
         .field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.257
+  version: 0.1.8.258
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,9 +213,6 @@ files:
 - app/controllers/ish_manager/sites_controller.rb
 - app/controllers/ish_manager/stock_watches_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
-- app/controllers/ish_manager/trash/ally_controller.rb
-- app/controllers/ish_manager/trash/stock_actions_controller.rb
-- app/controllers/ish_manager/trash/stock_options_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/venues_controller.rb

data/app/controllers/ish_manager/trash/ally_controller.rb

@@ -1,8 +0,0 @@
-
-class IshManager::AllyController < IshManager::ApplicationController
-
-  def home
-    authorize! :ally_home, IshManager::Ability
-  end
-
-end

data/app/controllers/ish_manager/trash/stock_actions_controller.rb

@@ -1,60 +0,0 @@
-
-class IshManager::StockActionsController < IshManager::ApplicationController
-
-  PERMITTED_PARAMS = [ :stock_watch, :is_active ]
-
-  def index
-    authorize! :index, Ish::StockAction
-    @profiles      = IshModels::UserProfile.all
-    @stock_watches_list = Ish::StockWatch.all.map { |w| [w.to_s, w.id] }
-    @stock_options_list = Ish::StockOption.all.map { |o| [ o.to_s, o.id] }
-    @stock_actions = Ish::StockAction.all.includes( :profile )
-    @stock_action  = Ish::StockAction.new
-    render 'index', :layout => 'ish_manager/application_no_materialize'
-  end
-
-  def create
-    @stock_action = Ish::StockAction.new params.require(:ish_stock_action).permit( PERMITTED_PARAMS )
-    @stock_action.profile = current_user.profile
-    authorize! :create, @stock_action
-
-    flag = true
-    if params[:ish_stock_action][:stock_options]
-      stock_options = Ish::StockOption.where( :id.in => params[:ish_stock_action][:stock_options] )
-      flag = stock_options.update_all( :stock_action_id => @stock_action.id )
-    end
-    if flag
-      flag = @stock_action.save
-    end
-    if flag
-      flash[:notice] = 'Created stock action.'
-    else
-      flash[:alert] = "Cannot create stock action: #{@stock_action.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-  def update
-    @stock_action = Ish::StockAction.find params[:id]
-    authorize! :update, @stock_action
-
-    flag = true
-    if params[:ish_stock_action][:stock_options]
-      stock_options = Ish::StockOption.where( :id.in => params[:ish_stock_action][:stock_options] )
-      flag = stock_options.update_all( :stock_action_id => @stock_action.id )
-    end
-    if flag
-      flag = @stock_action.update_attributes params.require(:ish_stock_action).permit( PERMITTED_PARAMS )
-    end
-    if flag
-      flash[:notice] = 'Updated stock action.'
-    else
-      flash[:alert] = "Cannot update stock action: #{@stock_action.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-end
-
-
-

data/app/controllers/ish_manager/trash/stock_options_controller.rb

@@ -1,41 +0,0 @@
-
-class IshManager::StockOptionsController < IshManager::ApplicationController
-
-  def index
-    authorize! :index, Ish::StockOption
-    @profiles = IshModels::UserProfile.all
-    @stock_options = Ish::StockOption.all.includes( :profile )
-    @stock_option = Ish::StockOption.new
-    render 'index', :layout => 'ish_manager/application_no_materialize'
-  end
-
-  def create
-    @stock_option = Ish::StockOption.new params[:ish_stock_option].permit!
-    @stock_option.profile = current_user.profile
-    authorize! :create, @stock_option
-    flag = @stock_option.save
-
-    if flag
-      flash[:notice] = 'Created stock option.'
-    else
-      flash[:alert] = "Cannot create stock option: #{@stock_option.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-  def update
-    @stock_option = Ish::StockOption.find params[:id]
-    authorize! :update, @stock_option
-    flag = @stock_option.update_attributes params[:ish_stock_option].permit!
-    if flag
-      flash[:notice] = 'Updated stock option.'
-    else
-      flash[:alert] = "Cannot update stock option: #{@stock_option.errors.messages}"
-    end
-    redirect_to :action => 'index'
-  end
-
-end
-
-
-