ish_manager 0.1.8.28 → 0.1.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7292d2c1859450514a41a8e06de9039bb1f7f3bc
-  data.tar.gz: 629ccdb9bc6838d31f126f97d5619874baad5445
+  metadata.gz: 4906e186c8e9a705ee44cf79f4634417b49a4846
+  data.tar.gz: 1c6c4f0140d51f29810b59fd3fccbdba51ecb7c1
 SHA512:
-  metadata.gz: 3cc8adfea424ea18ee718676f81baae526a646d125a4f7c99106b963cf3a63fd78b5ab76a1b651f0efc0e4d71279f34419775f74e9a1559f72254ad796e08446
-  data.tar.gz: 4fef125d5d9db186acd0db5a73e4399cddaf172986f51a383fd9358168fd5bb2cbb24615f63865d23c9e2254a8d44f58b2f698f45d640653393fe5183df654f9
+  metadata.gz: 61e5e96670dd89fe03d6380e4ea28ddd6b0352fb99cb3164579c4ca73c7e6ddc06c86878cb000780317ca4787832db957dbdb905eb05298d8c0cb1919f55ec5a
+  data.tar.gz: 008624bf8cd56187262d42f27334411e29225a7390d70a39a9ba0a03da097eea41c92786ac7563ea588aaaa72026e6200664da4ad559b48d3578ecf2d1aef817

data/README.md

@@ -1,5 +1,4 @@
 
 # Test
 
- # be rspec spec doesn't work so do
- be rspec spec/controllers
+ cd test/dummy && be rspec spec/controllers

data/app/controllers/ish_manager/application_controller.rb

@@ -26,5 +26,11 @@ module IshManager
       @tags_list = Tag.all.list
     end
 
+    private
+
+    def pp_errors err
+      err
+    end
+
   end
 end

data/app/controllers/ish_manager/features_controller.rb

@@ -4,65 +4,77 @@ class IshManager::FeaturesController < IshManager::ApplicationController
   before_action :set_lists
   
   def new
-    authorize! :new, ManagerFeature.new
-    @city = City.find params[:city_id] unless params[:city_id].blank?
-    @site = Site.find params[:site_id] unless params[:site_id].blank?
-    @tag = Tag.find params[:tag_id] unless params[:tag_id].blank?
+    if params[:city_id]
+      @city = City.find params[:city_id]
+      authorize! :new_feature, @city
+    elsif params[:site_id]
+      @site = Site.find params[:site_id]
+      authorize! :new_feature, @site
+    elsif params[:tag_id]
+      @tag = Tag.find params[:tag_id]
+      authorize! :new_feature, @tag
+    end
+
     @feature = Feature.new
   end
 
   def create
-    authorize! :create, ManagerFeature.new
+    @feature = Feature.new params[:feature].permit!
 
-    @feature = Feature.new params[:feature].permit( :name, :subhead, :image_path, :link_path, :partial_name, :photo, :weight,
-                                                    :report, :report_id, :gallery, :gallery_id, :video, :video_id
-                                                  )
     if params[:city_id]
       @city = City.find params[:city_id]
+      authorize! :create_feature, @city
       @city.features << @feature
-      redirect_path = manager_cities_path
+      @city.touch
+      redirect_path = cities_path
     end
     if params[:site_id]
       @site = Site.find params[:site_id]
+      authorize! :create_feature, @site
       @site.features << @feature
-      redirect_path = manager_sites_path
+      @site.touch
+      redirect_path = sites_path
     end
     if params[:tag_id]
       @tag = Tag.find params[:tag_id]
+      authorize! :create_feature, @tag
       @tag.features << @feature
-      redirect_path = manager_tags_path
+      @tag.touch
+      redirect_path = tags_path
     end
 
     if (@city && @city.save) || (@site && @site.save) || (@tag && @tag.save)
       flash[:notice] = 'Success.'
       redirect_to redirect_path
     else
-      flash[:error] = 'No Luck. ' + ( @city || @site || @tag ).errors.inspect
+      flash[:alert] = "No luck: #{pp_errors @feature.errors.messages}"
       render :action => :new
     end
   end
 
   def edit
-    authorize! :edit, ManagerCity.new
-    
     if params[:city_id]
       @city = City.find params[:city_id]
       @feature = @city.features.find params[:id]
+      authorize! :edit_feature, @city
     end
 
     if params[:site_id]
       @site = Site.find params[:site_id]
       @feature = @site.features.find params[:id]
+      authorize! :edit_feature, @site
     end
 
     if params[:tag_id]
       @tag = Tag.find params[:tag_id]
       @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]
+      authorize! :edit_feature, @venue
     end
 
   end
@@ -70,39 +82,44 @@ class IshManager::FeaturesController < IshManager::ApplicationController
   def update
     unless params[:city_id].blank?
       @city = City.find params[:city_id] 
-      authorize! :update, ManagerCity.new
+      authorize! :update_feature, @city
       @feature = @city.features.find params[:id]
-      redirect_path = manager_city_path( @city )
+      redirect_path = city_path( @city )
     end
     unless params[:site_id].blank?
       @site = Site.find params[:site_id] 
-      authorize! :update, ManagerSite.new
+      authorize! :update_feature, @site
       @feature = @site.features.find params[:id]
-      redirect_path = manager_site_path( @site )
+      redirect_path = site_path( @site )
     end
     unless params[:tag_id].blank?
       @tag = Tag.find params[:tag_id]
-      authorize! :update, ManagerTag.new
+      authorize! :update_feature, @tag
       @feature = @tag.features.find params[:id]
-      redirect_path = manager_tag_path( @tag )
+      redirect_path = tag_path( @tag )
     end
     
     if @feature.update_attributes params[:feature].permit!
-      flash[:notice] = 'Success'
+      @city.touch if @city
+      @site.touch if @site
+      @tag.touch  if @tag
+
+      flash[:notice] = 'updated feature'
       redirect_to redirect_path
     else
-      flash[:error] = 'No Luck. ' + @feature.errors.inspect
-      puts! @feature.errors, 'Errors updating feature'
-      render :action => :edit_feature
+      flash[:error] = 'No Luck. ' + @feature.errors.messages
+      render :action => :edit
     end    
   end
 
+=begin
   def index
     if params[:tag_id]
       @resource = Tag.find params[:tag_id]
     end
     
   end
+=end
 
   def destroy
     if params[:tag_id]

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -25,6 +25,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @city.newsitems << n
       flag = @city.save
       if flag
+        @city.touch
         url = edit_city_path( @city.id )
       else
         error = 'No Luck. ' + @city.errors.inspect
@@ -36,6 +37,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @site.newsitems << n
       flag = @site.save
       if flag
+        @site.touch
         url = edit_site_path( @site.id )
       else
         error = 'No Luck. ' + @site.errors.inspect
@@ -46,7 +48,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       flash[:notice] = 'Success'
       redirect_to url
     else
-      flash[:error] = error
+      flash[:alert] = error
       render :action => :new
     end
   end
@@ -108,6 +110,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   def set_lists
     @videos_list    = Video.list
     @galleries_list = Gallery.list
+    @reports_list   = Report.list
   end
 
 end

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -0,0 +1,15 @@
+
+class IshManager::UserProfilesController < IshManager::ApplicationController
+
+  def index
+    @user_profiles = IshModels::UserProfile.all
+    authorize! :index, IshModels::UserProfile
+  end
+
+  def show
+    @user_profile = IshModels::UserProfile.find params[:id]
+    authorize! :show, @user_profile
+  end
+
+end
+

data/app/controllers/ish_manager/user_profiles_controller.rb~

@@ -0,0 +1,13 @@
+
+class IshManager::UsersController < IshManager::ApplicationController
+
+  def index
+    @users = User.all
+  end
+
+  def show
+    @user = User.find params[:id]
+  end
+
+end
+

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

@@ -3,7 +3,7 @@
   %br
   .row
     .col-sm-6
-      - if current_user
+      - if defined?( current_user ) && current_user
         >[ #{current_user.email} ]<
         = button_to '[x]', main_app.destroy_user_session_path, :method => :delete
       - else

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

@@ -13,5 +13,6 @@
           %li= link_to 'Sites',     sites_path
           %li= link_to 'Venues',    venues_path
           %li= link_to 'Videos',    videos_path
+          %li= link_to 'Users',     user_profiles_path
   %hr
 

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

@@ -1,8 +1,6 @@
 
-- url ||= manager_cities_path
-
 .manager-cities--form
-  = form_for @city, :url => url do |f|
+  = form_for @city do |f|
     .row
       .small-6.columns
         .field

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

@@ -2,7 +2,9 @@
 .container
   .row
     .col-xs-12
-      %h1 Cities
+      %h1
+        Cities
+        = link_to '[+]', new_city_path
       
     - @cities.each do |city|
       .col-xs-3

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

@@ -1,23 +1,17 @@
 
 -# manager/features/_form
   
-- if @site
-  - if 'new' == params[:action]
-    - url = manager_site_features_path site.id 
-  - if 'edit' == params[:action]
-    - url = manager_site_feature_path site.id, feature.id 
-- elsif @city
-  - if 'new' == params[:action]
-    - url = manager_city_features_path city.id
-  - if 'edit' == params[:action]
-    - url = manager_city_feature_path city.id, feature.id 
-- elsif @tag
-  - if 'new' == params[:action]
-    - url = manager_tag_features_path tag.id
-  - if 'edit' == params[:action]
-    - url = manager_tag_feature_path tag.id, feature.id 
-
-= form_for feature, :url => url do |f|
+= form_for @feature do |f|
+  - if @city
+    = hidden_field_tag :city_id, @city.id
+    City #{@city.name}
+  - if @site
+    = hidden_field_tag :site_id, @site.id
+    Site #{@site.domain}
+  - if @tag
+    = hidden_field_tag :tag_id,  @tag.id  if @tag
+    Tag #{@tag.name}
+    
   .row
     .large-6.columns
       = f.label :name

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

@@ -3,14 +3,5 @@
   .large-12.columns
     %h1
       Edit Feature
-    .meta
-      = "in city #{@feature.city.name}" unless @feature.city.blank?
-      = "in site http://#{@feature.site.domain}/#{@feature.site.lang}" unless @feature.site.blank?
-      = "in tag #{@feature.tag.name}" unless @feature.tag.blank?
       
-- if @site
-  = render 'manager/features/form', :feature => @feature, :site => @site
-- elsif @city
-  = render 'manager/features/form', :feature => @feature, :city => @city
-- elsif @tag
-  = render 'manager/features/form', :feature => @feature, :tag => @tag
+= render 'form', :feature => @feature

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

@@ -14,6 +14,9 @@
   .a
     = f.label :gallery
     = f.select :gallery_id, options_for_select( @galleries_list )
+  .a
+    = f.label :report
+    = f.select :report_id, options_for_select( @reports_list )
   .a
     = f.submit :submit
   

data/app/views/ish_manager/newsitems/_index.haml

@@ -1,17 +1,19 @@
 
 - if defined? site
-  - edit_url   = ->(n) { edit_site_newsitem_path( site, n ) }
-  - delete_url = ->(n) { site_newsitem_path( site, n ) }
+  - edit_url     = ->(n) { edit_site_newsitem_path( site, n ) }
+  - delete_url   = ->(n) { site_newsitem_path( site, n ) }
+  - new_newsitem = new_site_newsitem_path( site.id )
 - if defined? city
-  - edit_url   = ->(n) { edit_city_newsitem_path( city, n ) }
-  - delete_url = ->(n) { city_newsitem_path( city, n ) }
-
+  - edit_url     = ->(n) { edit_city_newsitem_path( city, n ) }
+  - delete_url   = ->(n) { city_newsitem_path( city, n ) }
+  - new_newsitem = new_city_newsitem_path( city.id )
+  
 - newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
 
 .manager-newsitems--index
   .row
     .col-sm-12
-      %h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_site_newsitem_path( site.id )}
+      %h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_newsitem }
       = paginate newsitems, :param_name => 'newsitems_page'
       %ol
         - newsitems.each do |n|

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

@@ -1,2 +1,2 @@
 
-= render 'form', :site => @site, :url => manager_sites_path
+= render 'form', :site => @site, :url => sites_path

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

@@ -0,0 +1,12 @@
+
+%h1 User Profiles (#{@user_profiles.count})
+ 
+%ul
+  - @user_profiles.each do |profile|
+    %li
+       
+      %ul
+        %li= profile.email
+        %li= profile.name
+        %li= profile.fb_access_token
+      %br

data/app/views/ish_manager/user_profiles/index.haml~

@@ -0,0 +1,2 @@
+
+%h1 User Profiles

data/config/routes.rb

@@ -11,21 +11,32 @@ IshManager::Engine.routes.draw do
     resources :events
     resources :venues
   end
+
   resources :events
+
+  resources :features
+
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end
+
   resources :newsitems
+
   resources :photos
+
   resources :reports
+
   resources :sites do
     resources :features
     resources :galleries
     resources :newsitems
     resources :reports
   end
+
   resources :tags
+
   resources :user_profiles
+
   resources :venues
   resources :videos
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.28
+  version: 0.1.8.29
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,8 @@ files:
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
+- app/controllers/ish_manager/user_profiles_controller.rb
+- app/controllers/ish_manager/user_profiles_controller.rb~
 - app/controllers/ish_manager/users_controller.rb
 - app/controllers/ish_manager/venues_controller.rb
 - app/controllers/ish_manager/venues_controller.rb~
@@ -243,6 +245,8 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
+- app/views/ish_manager/user_profiles/index.haml
+- app/views/ish_manager/user_profiles/index.haml~
 - app/views/ish_manager/users/_index.haml
 - app/views/ish_manager/users/_index.haml~
 - app/views/ish_manager/venues/_form.haml