alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added page number fix for new pages

This commit is contained in:
Harry Bomrah 2014-07-18 17:21:16 +08:00
parent a96fb661c8
commit 2ed5d10b9d
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/import_controller.rb
View File

@ -231,6 +231,7 @@ class Admin::ImportController < OrbitAdminController
page_id = page_id + "_" + (number + 1).to_s
end
p = Page.new(:page_id => page_id, :parent_page_id => Page.root.id, :page_type => "page", :url => "/#{page_id}", :module => "page_content", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>page["title"]["en"], "zh_tw" => page["title"]["zh_tw"]},:rss2_id => page["page_id"])
p.number = Page.root.child_page.max(:number) + 1
p.save
en = smart_downloader(page["content"]["en"],data["site_url"])
zh_tw = smart_downloader(page["content"]["zh_tw"],data["site_url"])
@ -253,6 +254,7 @@ class Admin::ImportController < OrbitAdminController
case childpage["type"]
when "page"
cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "page", :url => "/#{p.page_id}/#{p_id}", :module => "page_content", "enabled_for" => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]},:rss2_id => childpage["page_id"])
cp.number = p.child_page.max(:number) + 1
cp.save
en = smart_downloader(childpage["content"]["en"],data["site_url"])
zh_tw = smart_downloader(childpage["content"]["zh_tw"],data["site_url"])
@ -260,6 +262,7 @@ class Admin::ImportController < OrbitAdminController
page_context.save
when "exturl"
cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "/#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => childpage["url"], "zh_tw" => childpage["url"]},:rss2_id => childpage["page_id"])
cp.number = p.child_page.max(:number) + 1
cp.save
when "file"
asset = Asset.new
@ -270,6 +273,7 @@ class Admin::ImportController < OrbitAdminController
@user.save
external_url = asset.data.url
cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "/#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => external_url, "zh_tw" => external_url},:rss2_id => childpage["page_id"])
cp.number = p.child_page.max(:number) + 1
cp.save
end
end

1
app/controllers/pages_controller.rb
View File

@ -320,6 +320,7 @@ class PagesController < ApplicationController
p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"")
p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"")
end
p[:number] = page.child_page.max(:number) + 1
p
end

1
app/models/page.rb
View File

@ -27,7 +27,6 @@ class Page
has_many :child_page, :class_name => 'Page', :inverse_of => :parent_page, :dependent => :destroy
belongs_to :parent_page, :class_name => 'Page', :inverse_of => :child_page
def to_param
page_id.parameterize
end

2
app/views/pages/_form.html.erb
View File

@ -5,7 +5,7 @@
<% if params[:action] == "new" %>
<label class="control-label">Page id :</label>
<div class="controls">
<%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id already taken.;"} %>
<%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %>
</div>
<% end %>
</div>

2
app/views/pages/_form_link.html.erb
View File

@ -6,7 +6,7 @@
<% if params[:action] == "new" %>
<label class="control-label">Page id :</label>
<div class="controls">
<%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id already taken.;"} %>
<%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;"} %>
</div>
<% end %>
<div class="controls">