imagine_cms 3.0.25 → 3.0.26
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/.ruby-version +1 -1
- data/app/controllers/management/cms_controller.rb +3 -3
- data/app/models/cms_page.rb +9 -1
- data/app/views/management/cms/edit_page_content.html.erb +6 -0
- data/imagine_cms.gemspec +2 -2
- data/lib/imagine_cms/engine.rb +1 -1
- data/lib/imagine_cms/version.rb +1 -1
- metadata +12 -12
checksums.yaml
CHANGED
@@ -1,15 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
|
5
|
-
data.tar.gz: !binary |-
|
6
|
-
ZTkwZGY5YTkyZDI5MWE3MTc0ZjUzM2U5YmYxOGIyNWY1YjRkMjE0YQ==
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: dfcd4a5ebffef204bd7855a693e65ec8419bf65a
|
4
|
+
data.tar.gz: dce16df887f99e7ab688881b5ad702672d08fdbb
|
7
5
|
SHA512:
|
8
|
-
metadata.gz:
|
9
|
-
|
10
|
-
ZjA3OWExYTBmMTg2MmQ5MDc0OGFmYmQ0MGZhYWU3ZDdiNDFiYThiYmUzNGU3
|
11
|
-
MjVjZDNiYTNjM2JmOTY3YmMyMDU3M2NkZTczMjVhNDYwODMzNTI=
|
12
|
-
data.tar.gz: !binary |-
|
13
|
-
ZDA2ODJjZjhkMmZhMGYwM2NiNWZhMDdhZmNmYTU5YzAzYWQ4ZWRkMzdhMTlk
|
14
|
-
MTk1ODk1ZWU0NjUwMzdmZTVhZWExZmIzZjcwM2IxOWZmNzk5NGFlZmM5NWE2
|
15
|
-
YTVjMGQzOTNjY2YwYzUwZWUyNjAyMDg3ZjA5MjIyMWI2MzJiOTY=
|
6
|
+
metadata.gz: 10fe0edfbcfe8e6b75e0fe4961d020d5ad36fd105b5ce63597ddaf5bd504979542908cd2b50d54f0369651872ce6c6bd670a539baf921a1f47f1b220b6725082
|
7
|
+
data.tar.gz: fa8c59235aa9b3a0ad08b78819e933ce274f9fed2227d1dd320324f79139fa5e9a4c99a27f3f5c7b5c61aa3f552d8e93a3fd27912910f9b19a30e19befd13aad
|
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
ruby-
|
1
|
+
ruby-2.0.0-p353
|
@@ -771,7 +771,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
|
|
771
771
|
# read zip file
|
772
772
|
|
773
773
|
entries = []
|
774
|
-
Zip::
|
774
|
+
Zip::File.foreach(data.path) do |zipentry|
|
775
775
|
next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
|
776
776
|
next if File.basename(zipentry.name) =~ /^\._/
|
777
777
|
|
@@ -779,7 +779,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
|
|
779
779
|
end
|
780
780
|
entries.sort! { |a,b| File.basename(a.name).downcase <=> File.basename(b.name).downcase }
|
781
781
|
|
782
|
-
Zip::
|
782
|
+
Zip::File.open(data.path) do |zipfile|
|
783
783
|
entries.each_with_index do |zipentry, index|
|
784
784
|
upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
|
785
785
|
ext = File.extname(zipentry.name)
|
@@ -1049,7 +1049,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
|
|
1049
1049
|
|
1050
1050
|
elsif ext == '.zip'
|
1051
1051
|
begin
|
1052
|
-
Zip::
|
1052
|
+
Zip::File.foreach(data.path) do |zipentry|
|
1053
1053
|
next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
|
1054
1054
|
upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
|
1055
1055
|
localfile = File.join(temp_location, ((last_id+1).to_s + File.extname(zipentry.name)).downcase)
|
data/app/models/cms_page.rb
CHANGED
@@ -21,6 +21,8 @@ class CmsPage < ActiveRecord::Base
|
|
21
21
|
|
22
22
|
before_validation :compute_and_store_path, :set_versions
|
23
23
|
|
24
|
+
after_save :resave_children
|
25
|
+
|
24
26
|
def compute_and_store_path
|
25
27
|
if self.parent
|
26
28
|
if self.parent.path != ''
|
@@ -42,6 +44,13 @@ class CmsPage < ActiveRecord::Base
|
|
42
44
|
self.published_date ||= self.created_on || Time.now
|
43
45
|
end
|
44
46
|
|
47
|
+
def resave_children
|
48
|
+
# get all pages under this one (even the offline ones)
|
49
|
+
CmsPage.where(:parent_id => id).each do |subpg|
|
50
|
+
subpg.save_without_revision if subpg.valid?
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
45
54
|
def tags_as_css_classes
|
46
55
|
self.tags.map { |t| t.name.downcase.gsub(/[^\w]+/, '-') }.join(' ')
|
47
56
|
end
|
@@ -92,7 +101,6 @@ class CmsPage < ActiveRecord::Base
|
|
92
101
|
def set_parent_id!(new_id)
|
93
102
|
self.parent_id = new_id
|
94
103
|
self.save_without_revision
|
95
|
-
pg.children.each { |subpg| subpg.save_without_revision }
|
96
104
|
self.valid?
|
97
105
|
end
|
98
106
|
|
@@ -2,3 +2,9 @@
|
|
2
2
|
<%= submit_tag 'Save', :id => 'btn_save', :style => 'display: none' %>
|
3
3
|
<%= render :inline => @template_content %>
|
4
4
|
<% end %>
|
5
|
+
|
6
|
+
<script type="text/javascript">
|
7
|
+
window.onbeforeunload = function () {
|
8
|
+
return "This page is asking you to confirm that you want to leave - data you have entered may not be saved."
|
9
|
+
};
|
10
|
+
</script>
|
data/imagine_cms.gemspec
CHANGED
@@ -27,12 +27,12 @@ Gem::Specification.new do |s|
|
|
27
27
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
28
28
|
s.require_paths = ["lib"]
|
29
29
|
|
30
|
-
s.add_dependency "rails", "~> 3.2.
|
30
|
+
s.add_dependency "rails", "~> 3.2.16"
|
31
31
|
s.add_dependency "prototype-rails", "~> 3.2.0"
|
32
32
|
s.add_dependency "aws-s3", "~> 0.6.3"
|
33
33
|
s.add_dependency "rmagick"
|
34
34
|
s.add_dependency "mini_magick", "~> 3.3"
|
35
|
-
s.add_dependency "rubyzip", "
|
35
|
+
s.add_dependency "rubyzip", "~> 1.0"
|
36
36
|
s.add_dependency "rinku", "~> 1.7.2"
|
37
37
|
s.add_dependency "net-dns", "~> 0.7.1"
|
38
38
|
s.add_dependency "acts_as_tree", "~> 1.1"
|
data/lib/imagine_cms/engine.rb
CHANGED
data/lib/imagine_cms/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: imagine_cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.26
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Aaron Namba
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2014-01-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.2.
|
19
|
+
version: 3.2.16
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ~>
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 3.2.
|
26
|
+
version: 3.2.16
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: prototype-rails
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -56,14 +56,14 @@ dependencies:
|
|
56
56
|
name: rmagick
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - '>='
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '0'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - '>='
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
@@ -84,14 +84,14 @@ dependencies:
|
|
84
84
|
name: rubyzip
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ~>
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '1.0'
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - ~>
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '1.0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
@@ -140,14 +140,14 @@ dependencies:
|
|
140
140
|
name: sqlite3
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - '>='
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: '0'
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - '>='
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '0'
|
153
153
|
description: See README for details.
|
@@ -510,12 +510,12 @@ require_paths:
|
|
510
510
|
- lib
|
511
511
|
required_ruby_version: !ruby/object:Gem::Requirement
|
512
512
|
requirements:
|
513
|
-
- -
|
513
|
+
- - '>='
|
514
514
|
- !ruby/object:Gem::Version
|
515
515
|
version: 1.9.3
|
516
516
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
517
517
|
requirements:
|
518
|
-
- -
|
518
|
+
- - '>='
|
519
519
|
- !ruby/object:Gem::Version
|
520
520
|
version: 1.8.11
|
521
521
|
requirements: []
|