ish_manager 0.1.8.36 → 0.1.8.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612f4af3c46b7d22677a10ee633faef6855978b9
-  data.tar.gz: 22aace4640e3e92d5a4ab15c88a950a16914c77d
+  metadata.gz: a622f2fe5deaa768db66c2050f042f7f6858f0e6
+  data.tar.gz: 3b56657b81f037d6276914ac85863ffd10d5999b
 SHA512:
-  metadata.gz: daa6fdfc439c55ae8c7480cd51a172f739a012056948dd3d1fd7aeca4a0b5628cf2cccd21ac27a718ef8a921b791b5251c855ad7119471b8188351259137b492
-  data.tar.gz: a94357491b7164dd0989677cac130fabc3a7723bec846f95a295aac60f9632ef9938f8a71602b6b404fc8b5cd1de06c91504aec70b93429e45164deb70b58797
+  metadata.gz: 5e0ac390eb79caf399a629cfe793e1ede81a9a26b7dc42839cde59ae31a42bbcab782944d8aca28bc67cda41edf407df5018c0a52337970393c5b04fc0497dba
+  data.tar.gz: 459f48e84910830234b1561d590d53cda99c34523fa2e0038c4186c7a954ceb9a1bd549c788eb79df58f97f767f13f9d981a70a33bdef17f5e121d5ba5fca644

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -18,32 +18,19 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def create
     n = Newsitem.new params[:newsitem].permit!
-    authorize! :create, n
+    @resource = City.find params[:city_id] if params[:city_id]
+    @resource = Site.find params[:site_id] if params[:site_id]
+    authorize! :create_newsitem, @resource
 
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @city.newsitems << n
-      flag = @city.save
-      if flag
-        @city.touch
-        url = edit_city_path( @city.id )
-      else
-        error = 'No Luck. ' + @city.errors.inspect
-      end
+    @resource.newsitems << n
+    flag = @resource.save
+    if flag
+      @resource.touch
+    else
+      error = 'No Luck. ' + @resource.errors.inspect
     end
+    url = params[:city_id] ? edit_city_path( @resource.id ) : edit_site_path( @resource.id )
     
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @site.newsitems << n
-      flag = @site.save
-      if flag
-        @site.touch
-        url = edit_site_path( @site.id )
-      else
-        error = 'No Luck. ' + @site.errors.inspect
-      end
-    end
-
     if flag
       flash[:notice] = 'Success'
       redirect_to url

data/app/controllers/ish_manager/reports_controller.rb

@@ -82,6 +82,13 @@ class IshManager::ReportsController < IshManager::ApplicationController
     @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
@@ -127,7 +134,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
         end
 
         format.html do
-          redirect_to reports_path, :notice => 'Report was successfully created (but newsitem, no information).' 
+          redirect_to redirect_path, :notice => 'Report was successfully created (but newsitem, no information).' 
         end
         format.json { render :json => @report, :status => :created, :location => @report }
       else

data/app/controllers/ish_manager/sites_controller.rb

@@ -1,8 +1,8 @@
 class IshManager::SitesController < IshManager::ApplicationController
   
   def index
-    authorize! :index, @site
-    @sites = Site.all.order_by( :domainname => :desc, :lang => :desc )
+    authorize! :sites_index, ::Manager
+    @sites = Site.where( :is_trash => false ).order_by( :domainname => :desc, :lang => :desc )
   end
 
   # not trash
@@ -12,7 +12,7 @@ class IshManager::SitesController < IshManager::ApplicationController
   end
 
   def show
-    @site = Site.find params[:id]
+    @site = Site.unscoped.find params[:id]
     authorize! :show, @site
     @galleries = @site.galleries.unscoped.where({ :is_trash => false }).page( params[:galleries_page] ).per( 10 )
     @reports = @site.reports.unscoped.where({ :is_trash => false }).page( params[:reports_page] ).per( 10 )
@@ -40,11 +40,11 @@ class IshManager::SitesController < IshManager::ApplicationController
     else
       flash[:error] = 'No Luck. ' + @site.errors.inspect
     end
-    redirect_to manager_sites_path
+    redirect_to sites_path
   end
 
   def update
-    @site = Site.find params[:id]
+    @site = Site.unscoped.find params[:id]
     authorize! :update, @site
     
     if @site.update_attributes params[:site].permit!
@@ -52,7 +52,7 @@ class IshManager::SitesController < IshManager::ApplicationController
     else
       flash[:error] = 'No Luck'
     end
-    redirect_to manager_sites_path
+    redirect_to sites_path
   end
 
   def newsitem_delete    
@@ -62,7 +62,7 @@ class IshManager::SitesController < IshManager::ApplicationController
     n.delete
     @site.save
     flash[:notice] = 'Probably successfully deleted a newsitem.'
-    redirect_to manager_site_path( @site.id )
+    redirect_to site_path( @site.id )
   end
 
 end

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -11,5 +11,22 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     authorize! :show, @user_profile
   end
 
+  def edit
+    @profile = IshModels::UserProfile.find params[:id]
+    authorize! :edit, @profile
+  end
+
+  def update
+    @profile = IshModels::UserProfile.find params[:id]
+    authorize! :update, @profile
+    flag = @profile.update_attributes params[:ish_models_user_profile].permit!
+    if flag
+      flash[:notice] = "Updated profile #{@profile.email}"
+    else
+      flash[:alert] = "Cannot update profile: #{pp_errors @profile.errors.messages}"
+    end
+    redirect_to :action => :index
+  end
+
 end
 

data/app/controllers/ish_manager/venues_controller.rb

@@ -4,7 +4,7 @@ class IshManager::VenuesController < IshManager::ApplicationController
   before_action :set_lists
 
   def index
-    authorize! :index, Venue
+    authorize! :venues_index, ::Manager
     @venues = Venue.all
   end
 

data/app/helpers/ish_manager/application_helper.rb

@@ -5,5 +5,9 @@ module IshManager
       return input.strftime("%Y-%m-%d")
     end
 
+    def pp_errors errors
+      return errors
+    end
+
   end
 end

data/app/models/ish_manager/ability.rb

@@ -9,7 +9,24 @@ class IshManager::Ability
     #
     unless user.blank?
 
-      if user.profile && user.profile.manager?
+      # role manager
+      if user.profile && user.profile.role_name == :manager
+
+        can [ :create_newsitem, :show ], ::City
+
+        can [ :cities_index, :home, :sites_index, :venues_index ], ::Manager
+
+        can [ :new ], Newsitem
+
+        can [ :new, :create ], Report
+
+        can [ :show, :edit, :update, :create_newsitem ], ::Site do |site|
+          !site.is_private && !site.is_trash
+        end
+
+      end
+
+      if user.profile && user.profile.sudoer?
         can :manage, :all
         can [ :home ], ::Manager
         can :destroy, ::Photo

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

@@ -2,15 +2,16 @@
 .container
   %br
   .row
-    .col-sm-6
+    .col-sm-5
       - if defined?( current_user ) && current_user
-        >[ #{current_user.email} ]<
-        = button_to '[x]', main_app.destroy_user_session_path, :method => :delete
+        %ul
+          %li >[ #{current_user.email} ]<
+          %li >[ #{current_user.profile.role_name} ]<
       - else
         Please log in
         = link_to '[+]', main_app.new_user_session_path
 
-    .col-sm-6
+    .col-sm-5
       %br
       \~__^
       %br
@@ -18,3 +19,5 @@
       %br
       %br
       %br
+    .col-sm.2
+      = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete

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

@@ -1,3 +1,3 @@
 
-Welcome home! (ish manager)
+Welcome home! Your role is #{current_user.profile.role_name}.
 

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

@@ -15,9 +15,9 @@
     .col-sm-12
       %h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_newsitem }
       = paginate newsitems, :param_name => 'newsitems_page'
-      %ol
-        - newsitems.each do |n|
-          %li
+      - newsitems.each do |n|
+        .panel
+          .panel-body
             %ul
               %li
                 = link_to '[~]', edit_url.call( n )

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

@@ -36,14 +36,14 @@
 
     .row
       .small-4.columns
-        = f.label :is_trash
         = f.check_box :is_trash
+        = f.label :is_trash
       .small-4.columns
-        = f.label :is_private
         = f.check_box :is_private
+        = f.label :is_private
       .small-4.columns
-        = f.label :is_ads_enabled
         = f.check_box :is_ads_enabled
+        = f.label :is_ads_enabled
         
     .row
       .large-12.columns

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

@@ -3,11 +3,11 @@
   %h3 Sites
   .row
     - @sites.each do |site|
-      .col-xs-6
+      .col-xs-12.col-md-6.col-lg-4
         .panel.panel-primary
           .panel-body
-            %h4
-              = link_to "http://#{site.domain}/#{site.lang}", site_path( site )
+            %h5
+              = link_to "#{site.domain}/#{site.lang}", site_path( site )
               = link_to '[~]', edit_site_path( site )
             .title Title: #{site.title}
             .subhead Subhead: #{site.subhead}

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

@@ -0,0 +1,12 @@
+
+.a
+  = form_for @profile do |f|
+    .field
+      = f.label :email
+      = f.text_field :email, :disabled => true
+    .field
+      = f.label :role_name
+      = f.select :role_name, ::IshModels::UserProfile::ROLES
+    .action
+      = f.submit 'Submit', :class => %w(button)
+    

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

@@ -0,0 +1 @@
+

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

@@ -1,12 +1,14 @@
 
-%h1 User Profiles (#{@user_profiles.count})
+%h1
+  User Profiles (#{@user_profiles.count})
+  = link_to '[+]', new_user_profile_path
  
 %ul
   - @user_profiles.each do |profile|
-    %li
-       
+    .panel
       %ul
-        %li= profile.email
-        %li= profile.name
-        %li= profile.fb_access_token
+        %li= link_to '[edit]', edit_user_profile_path( profile )
+        %li Email: #{profile.email}
+        %li Name: #{profile.name}
+        %li Role: #{profile.role_name}
       %br

data/config/routes.rb

@@ -36,6 +36,7 @@ IshManager::Engine.routes.draw do
   resources :tags
 
   resources :user_profiles
+  resources :user_profiles, :as => :ish_models_user_profiles
 
   resources :venues
   resources :videos

data/lib/tasks/ish_manager_tasks.rake

@@ -1,4 +1,16 @@
-# desc "Explaining what the task does"
-# task :ish_manager do
-#   # Task goes here
-# end
+
+namespace :ish do
+
+  desc "every user needs a user_profile"
+  task :generate_user_profiles => :environment do
+    User.all.map do |u|
+      unless u.profile
+        p = ::IshModels::UserProfile.new :email => u.email, :user => u, :role_name => :guy
+        u.profile = p
+        u.save && p.save && print('.')
+      end
+    end
+    puts 'OK'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.36
+  version: 0.1.8.37
 platform: ruby
 authors:
 - piousbox
@@ -262,6 +262,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/edit.haml
+- app/views/ish_manager/user_profiles/edit.haml~
 - app/views/ish_manager/user_profiles/index.haml
 - app/views/ish_manager/user_profiles/index.haml~
 - app/views/ish_manager/users/_index.haml