Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
Conflicts: lib/tasks/migrate.rake
This commit is contained in:
commit
39f715319b
app
lib/tasks
vendor/built_in_modules/gallery/app/controllers/panel/gallery
|
@ -46,12 +46,16 @@ class Admin::TagsController < OrbitBackendController
|
|||
|
||||
protected
|
||||
|
||||
def set_module_app
|
||||
@module_app ||= ModuleApp.first(:conditions => {:key => @app_title.underscore}) rescue nil
|
||||
end
|
||||
|
||||
def get_tags
|
||||
@tags = (@module_app ? @module_app.tags : Tag.all)
|
||||
end
|
||||
|
||||
def setup_vars
|
||||
@app_key = request.env['HTTP_REFERER'].split('/')[4]
|
||||
if @app_key
|
||||
@app_key.gsub!(/[?].*/, '')
|
||||
@module_app = ModuleApp.first(conditions: {:key => @app_key})
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -47,10 +47,10 @@ class Item
|
|||
new_parent = Item.find(new_parent)
|
||||
current_position_sibling = find_by_parent_and_position(new_parent, position.to_i)
|
||||
if current_position_sibling
|
||||
current_position_sibling.at_bottom? ? move_below(current_position_sibling) : move_above(current_position_sibling)
|
||||
move_above(current_position_sibling)
|
||||
elsif self.parent != new_parent
|
||||
self.parent = new_parent
|
||||
save!
|
||||
save
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -24,14 +24,12 @@ class Page < Item
|
|||
has_many :page_metas, :autosave => true, :dependent => :destroy
|
||||
accepts_nested_attributes_for :page_parts, :allow_destroy => true
|
||||
|
||||
before_save :delete_empty_frontend_field
|
||||
before_save :create_parts, if: Proc.new { |page| page.new_record? || page.design_id_changed? }
|
||||
after_save :generate_html
|
||||
before_save :delete_empty_frontend_field, :generate_html
|
||||
|
||||
# protected
|
||||
protected
|
||||
|
||||
def create_parts
|
||||
|
||||
page_design = self.design
|
||||
parent = self.parent
|
||||
menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
|
||||
|
@ -73,10 +71,7 @@ class Page < Item
|
|||
end
|
||||
|
||||
def generate_html
|
||||
Page.without_callback(:save, :after, :generate_html) do
|
||||
self.content_translations = parse_page_noko(self, Site.first)
|
||||
self.save
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -350,10 +350,26 @@ namespace :migrate do
|
|||
ModuleApp.new.from_json(File.open("#{Rails.root}/vendor/built_in_modules/gallery/gallery.json").read).save
|
||||
end
|
||||
|
||||
|
||||
task :make_default_widget_work_config => :environment do
|
||||
a = ModuleApp.where(:key=>'announcement').first
|
||||
a.widgets[:default_widget] = ['typeA','typeC','typeB_style2','typeB_style3','typeB_style4']
|
||||
a.widget_fields = ["title","bulletin_category","postdate"]
|
||||
a.save
|
||||
end
|
||||
|
||||
|
||||
task :reorder_items => :environment do
|
||||
reorder_children(Item.root)
|
||||
end
|
||||
|
||||
def reorder_children(parent)
|
||||
parent.children.each_with_index do |child, i|
|
||||
child.position = i
|
||||
child.save
|
||||
reorder_children(child) if child.children
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
|
|
@ -177,7 +177,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
|
|||
theater_link: panel_gallery_back_end_album_image_path(values),
|
||||
description: values.description,
|
||||
title: values.title,
|
||||
file: values.file,
|
||||
file: values.file.as_json[:file],
|
||||
gallery_album_id: values.gallery_album_id,
|
||||
tag_ids: values.tag_ids,
|
||||
tag_names: tags}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
||||
|
||||
def index
|
||||
|
||||
end
|
||||
|
||||
def show
|
||||
|
@ -10,7 +8,6 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
|||
@album.tag_ids.each do |tag|
|
||||
@tags << GalleryTag.find(tag)[I18n.locale]
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def get_albums
|
||||
|
@ -61,8 +58,6 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
|||
render :json=>@output.to_json
|
||||
end
|
||||
|
||||
|
||||
|
||||
def imgs
|
||||
@album = GalleryAlbum.find(params[:id])
|
||||
@images = @album.gallery_images.all
|
||||
|
@ -72,9 +67,16 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
|||
values.tag_ids.each do |tag|
|
||||
tags << GalleryTag.find(tag)[I18n.locale]
|
||||
end
|
||||
@output << {"_id"=>values.id,"theater_link"=>theater_panel_gallery_front_end_album_path(values),"description"=>values.description,"title"=>values.title,"file"=>values.file,"gallery_album_id"=>values.gallery_album_id,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
|
||||
@output << {:_id => values.id,
|
||||
:theater_link => theater_panel_gallery_front_end_album_path(values),
|
||||
:description => values.description,
|
||||
:title => values.title,
|
||||
:file => values.file.as_json[:file],
|
||||
:gallery_album_id => values.gallery_album_id,
|
||||
:tag_ids => values.tag_ids,
|
||||
:tag_names => tags}
|
||||
end
|
||||
render :json=>{"images" => @output}.to_json
|
||||
render :json=>{:images => @output}.to_json
|
||||
end
|
||||
|
||||
def images_tags
|
||||
|
@ -99,12 +101,4 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
|||
end
|
||||
@back_link = panel_gallery_front_end_album_path(@albumid)
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue