ish_manager 0.1.8.85 → 0.1.8.86

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f587dcdd745befc26699672158c072e4dac31bf2
4
- data.tar.gz: 7420c0f4c83c3308a1f4f5b4140d070bfecd8a03
3
+ metadata.gz: d06597d0dec1ec76e699510c3a46f2cae9feb311
4
+ data.tar.gz: 0b34bdd0a5e52f64c2d8bb9cafc5f1ce622ebd84
5
5
  SHA512:
6
- metadata.gz: 89a96c82e5a5663093d3fccd80e8c1b2221b6f39a0f9a939305e08fd2b3fab7b1d3e92e555ec5855daa4bc24022501a3c92b00acc5e4eec6c9abecab9bea41c9
7
- data.tar.gz: 45af2575d0a032bfccdc70905b167e699f9821a1d30efd96e4a1b7384dd0e27ed97eff305fd11c50e44dd809936c1e1e0c6b3b4542cdc47c784189b2eadbda65
6
+ metadata.gz: '0930d1aff57d7d22466f4a2e2c030edd74b1709efb41e4397222a9c7f6b734e67b4eb5fa3db4cb845b896d8a3856c0122dfa01c56adc4f975fcbe6b806039fc0'
7
+ data.tar.gz: dbc6839708925d9b626618d1d5c6ad3fc6e46b828da51997aa825553a1dea96b048d9deb624d54dca388dcea3208c86753cb4cf28aeb70a277f5ca0d847358e3
@@ -2,15 +2,24 @@ module IshManager
2
2
  class ApplicationController < ActionController::Base
3
3
  # protect_from_forgery :with => :exception, :prepend => true
4
4
  before_action :set_current_ability
5
+ before_action :set_changelog
5
6
  check_authorization
7
+ rescue_from ::CanCan::AccessDenied, :with => :access_denied
6
8
 
7
9
  def home
8
10
  authorize! :home, IshManager::Ability
9
11
  render 'home'
10
12
  end
11
13
 
14
+ #
15
+ # private
16
+ #
12
17
  private
13
18
 
19
+ def set_changelog
20
+ @version = Gem.loaded_specs['ish_manager'].version.to_s
21
+ end
22
+
14
23
  def set_current_ability
15
24
  @current_ability ||= ::IshManager::Ability.new( current_user )
16
25
  end
@@ -26,10 +35,6 @@ module IshManager
26
35
  @tags_list = Tag.list
27
36
  end
28
37
 
29
- rescue_from ::CanCan::AccessDenied, :with => :access_denied
30
-
31
- private
32
-
33
38
  def access_denied exception
34
39
  store_location_for :user, request.path
35
40
  redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
@@ -16,7 +16,8 @@
16
16
  .col-sm-5
17
17
  %br
18
18
  \~__^
19
- 1.6
19
+ = @version
20
+ -# <pre>#{@changelog}</pre>
20
21
  %br
21
22
  %br
22
23
  %br
@@ -18,7 +18,7 @@
18
18
  %li <b>About:</b> #{profile.about}
19
19
  .col-sm-8
20
20
  Shared galleries:<br />
21
- - profile.shared_galleries.each do |g|
21
+ - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
22
22
  &gt; #{link_to g.name, gallery_path(g.galleryname)} <br />
23
23
  = render 'meta', :item => g
24
24
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.85
4
+ version: 0.1.8.86
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox