abstracted 0.4.12 → 0.4.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/abstract_resources.js +0 -1
- data/app/assets/javascripts/abstracted/app.fab_delete.coffee +1 -0
- data/app/assets/javascripts/abstracted/app.page_scrolling.coffee +3 -0
- data/app/assets/javascripts/abstracted/app.resources_list.coffee +4 -0
- data/app/controllers/abstract_resources_controller.rb +2 -2
- data/lib/abstracted/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8356a5cae50252a773af6e9e9bc3d018f528b457
|
|
4
|
+
data.tar.gz: 6a9b34b1d54fe93e2247092b568a2bdf12cfeb30
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c9b56efbf6988d4173710953b7dc4340536e7fef21ea8489d75383d847df1e355d6ebcbf70aba64992b1e468975cd72daf70205fc40cd4073d00a1a4e2541f37
|
|
7
|
+
data.tar.gz: b933343e8ace51e0ce9b172ee8f2ba5561f28a5bbd191546347ba2ef939e4f37d540ce0d8671b178dd16349d5e0988db1f7f22ec0166bbb418f75c21beab1e79
|
|
@@ -24,6 +24,7 @@ class App.fabDelete
|
|
|
24
24
|
App.shared.closeSweetAlert($elem)
|
|
25
25
|
#swal("Deleted!", "Your file was successfully deleted!", "success")
|
|
26
26
|
.fail (data) =>
|
|
27
|
+
$('#message_container').html(data.responseText)
|
|
27
28
|
$elem.show()
|
|
28
29
|
swal("Oops", "We couldn't connect to the server!", "error")
|
|
29
30
|
|
|
@@ -42,6 +42,7 @@ class App.PageScrolling
|
|
|
42
42
|
@contxt = $(elem)
|
|
43
43
|
if @nextPage > 1
|
|
44
44
|
@nextPage = 1
|
|
45
|
+
console.log 'did setVariables'
|
|
45
46
|
true
|
|
46
47
|
|
|
47
48
|
catch error
|
|
@@ -92,6 +93,7 @@ class App.PageScrolling
|
|
|
92
93
|
loadNextPage: (url,replace=false) =>
|
|
93
94
|
# url = @findNextPageToLoad()
|
|
94
95
|
if url
|
|
96
|
+
console.log 'getting ready to load another page'
|
|
95
97
|
return unless App.shared.spinWhileLoading '.fixed-action-btn', '<div class="preloader-wrapper small active"> <div class="spinner-layer spinner-blue-only"> <div class="circle-clipper left"> <div class="circle"></div> </div><div class="gap-patch"> <div class="circle"></div> </div><div class="circle-clipper right"> <div class="circle"></div> </div> </div> </div>'
|
|
96
98
|
jqxhr = $.ajax
|
|
97
99
|
url: url
|
|
@@ -111,6 +113,7 @@ class App.PageScrolling
|
|
|
111
113
|
# scroll a list - behind the scenes calling in extra pages of content
|
|
112
114
|
#
|
|
113
115
|
scrollTable: (elem) =>
|
|
116
|
+
console.log elem
|
|
114
117
|
return if $(elem)[0] == undefined || App.currentPage == $(elem)[0].id
|
|
115
118
|
App.currentPage = $(elem)[0].id
|
|
116
119
|
return unless @setVariables(elem)
|
|
@@ -17,6 +17,8 @@ class App.ResourcesList
|
|
|
17
17
|
# handleLinkedUrls handles other urls referred by an A tag
|
|
18
18
|
#
|
|
19
19
|
handleLinkedUrls: (e) =>
|
|
20
|
+
e.preventDefault()
|
|
21
|
+
e.stopPropagation()
|
|
20
22
|
loaded_element = $(e.currentTarget)
|
|
21
23
|
App.shared.spinWhileLoading( loaded_element )
|
|
22
24
|
url = '&' + $(e.currentTarget).data('url').split('?')[1]
|
|
@@ -26,6 +28,8 @@ class App.ResourcesList
|
|
|
26
28
|
# handleColumnSort will
|
|
27
29
|
#
|
|
28
30
|
handleColumnSort: (e) =>
|
|
31
|
+
e.preventDefault()
|
|
32
|
+
e.stopPropagation()
|
|
29
33
|
dir = $(e.currentTarget).data('direction') || 'asc'
|
|
30
34
|
fld = $(e.currentTarget).data('field') || 'id'
|
|
31
35
|
srt = '&s=' + fld + '&d=' + dir
|
|
@@ -171,11 +171,11 @@ class AbstractResourcesController < ApplicationController
|
|
|
171
171
|
def destroy
|
|
172
172
|
authorize resource
|
|
173
173
|
result = true if delete_resource && update_parenthood
|
|
174
|
-
result ? (flash.now[:notice] = t('.success', resource: resource_class.to_s)) : (flash.now[:error] = t('.deleted.error',resource: resource_class.to_s))
|
|
174
|
+
result ? (flash.now[:notice] = t('.success', resource: resource_class.to_s)) : (flash.now[:error] = t('.deleted.error',resource: resource_class.to_s) + " " + resource.errors.messages.values.join( " / "))
|
|
175
175
|
if result==true
|
|
176
176
|
render layout:false, status: 200, locals: { result: true }
|
|
177
177
|
else
|
|
178
|
-
render layout:false, status: 301, locals: { result: true }
|
|
178
|
+
render layout:false, status: 301, locals: { result: true, errors: resource.errors.messages.values.join( " / ") }
|
|
179
179
|
end
|
|
180
180
|
rescue Exception => e
|
|
181
181
|
scoop_from_error e
|
data/lib/abstracted/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: abstracted
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.13
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Walther H Diechmann
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-11-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|