glib-web 3.14.0 → 3.14.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/concerns/glib/json/libs.rb +13 -8
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 54a6c076090246a41731c8b0384a08caeb417e7f448432b9960b8d0a6749925a
|
4
|
+
data.tar.gz: e092d37e661267d4b076cc140fd8bce49aa3927b952e5b99a8aacd8427abe1f7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0751103a45003c6456e929555f0213f673b39a489a6c39abab1e28c9005ae2515bf6517b84851ab8862d4aa244fdfbef171a949bdc771d2e2027c6a6a9f19c42
|
7
|
+
data.tar.gz: 66da47d3891c763ae66e9a30b08c43f7a859046abca14089e9dd5af0591478cccd4c3101d8ba2bde61d3cf5cab373192dcaf339b46b83991d44a8396c462ec9f
|
@@ -66,7 +66,7 @@ module Glib::Json::Libs
|
|
66
66
|
redirect_to url
|
67
67
|
end
|
68
68
|
format.json do
|
69
|
-
|
69
|
+
json_ui_redirect_to url
|
70
70
|
end
|
71
71
|
end
|
72
72
|
end
|
@@ -132,16 +132,21 @@ module Glib::Json::Libs
|
|
132
132
|
end
|
133
133
|
|
134
134
|
def __delete_redirect_back_url(url)
|
135
|
-
|
135
|
+
session.delete(REDIRECT_BACK_KEY) || url
|
136
136
|
end
|
137
137
|
|
138
|
-
def glib_redirect_back_or_to(
|
139
|
-
|
140
|
-
|
138
|
+
# def glib_redirect_back_or_to(default_url)
|
139
|
+
# redirect_url = __delete_redirect_back_url(default_url)
|
140
|
+
# glib_redirect_to redirect_url
|
141
|
+
# end
|
142
|
+
|
143
|
+
def html_ui_redirect_back_or_to(default_url)
|
144
|
+
redirect_url = __delete_redirect_back_url(default_url)
|
145
|
+
redirect_to redirect_url
|
141
146
|
end
|
142
147
|
|
143
|
-
def json_ui_redirect_back_or_to(
|
144
|
-
redirect_url = __delete_redirect_back_url(
|
148
|
+
def json_ui_redirect_back_or_to(default_url, json_action)
|
149
|
+
redirect_url = __delete_redirect_back_url(default_url)
|
145
150
|
json_action.windows_closeAll onClose: ->(subaction) do
|
146
151
|
subaction.windows_open url: redirect_url
|
147
152
|
end
|
@@ -182,7 +187,7 @@ module Glib::Json::Libs
|
|
182
187
|
end
|
183
188
|
end
|
184
189
|
|
185
|
-
def
|
190
|
+
def json_ui_redirect_to(url)
|
186
191
|
render json: {
|
187
192
|
onResponse: { action: 'dialogs/close', onClose: { action: 'windows/open', url: url } }
|
188
193
|
}
|