softwear-lib 3.3.5 → 3.3.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/softwear/error_catcher.rb +2 -9
- data/lib/softwear/library/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 382577d8ccba0d4d4c2711feb33d9b8970074175
|
|
4
|
+
data.tar.gz: 9ed5aaf50588622a7689a7cef209e528dda78fdd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a08960472e9cbc6c784497f799beacfe083c7008aaffa3e88c05cd9a0219626230aef81b885a98cfd12db5f679eb9b2d61c6db41e17e721afeea6ba69af1f832
|
|
7
|
+
data.tar.gz: 4b523435da1f1d9891cbf8ed8991c2abd4bd40ecadea678ce33a204f2737a3222cd1d677a4a0bbc833c85d28f12a301299b19eafdd069b87da4ab00dcfb3c0aa
|
|
@@ -26,6 +26,7 @@ module Softwear
|
|
|
26
26
|
@additional_info = gather_additional_info
|
|
27
27
|
|
|
28
28
|
begin
|
|
29
|
+
Rails.logger.error "WTF THIS NO WORKY! THIS IS THE LAYOUT: #{layout_for_error}"
|
|
29
30
|
respond_to do |format|
|
|
30
31
|
format.html { render 'softwear/errors/internal_server_error', layout: layout_for_error, status: 500 }
|
|
31
32
|
format.js { render 'softwear/errors/internal_server_error', layout: layout_for_error, status: 500 }
|
|
@@ -67,15 +68,7 @@ module Softwear
|
|
|
67
68
|
|
|
68
69
|
def layout_for_error
|
|
69
70
|
user = try(:current_user) || @current_user
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if user
|
|
73
|
-
"application"
|
|
74
|
-
elsif !partner.nil? && request.url.include?(partner)
|
|
75
|
-
"partners/application"
|
|
76
|
-
else
|
|
77
|
-
"no_overlay"
|
|
78
|
-
end
|
|
71
|
+
user ? "application" : "no_overlay"
|
|
79
72
|
end
|
|
80
73
|
end
|
|
81
74
|
end
|