diff --git a/app/assets/javascripts/inc/update_cates_and_tags.js b/app/assets/javascripts/inc/update_cates_and_tags.js
new file mode 100644
index 000000000..223cd8d73
--- /dev/null
+++ b/app/assets/javascripts/inc/update_cates_and_tags.js
@@ -0,0 +1,21 @@
+function update_cates_and_tags()
+{
+ $('.select_option,.select_all').removeAttr('disabled');
+ $(".select_all:checked").each(function( obj ) {
+ $(this).parent().siblings('label').find('.select_option').attr('disabled',true);
+ $(this).parent().siblings('label').find('.select_option').removeAttr('checked');
+ });
+ $(".select_option:checked").each(function( obj ) {
+ $(this).parent().siblings('label').find('.select_all').attr('disabled',true);
+ $(this).parent().siblings('label').find('.select_all').removeAttr('checked');
+ });
+}
+
+function rebind(){
+ $("#widget_data_source_category,#widget_data_source_tag,#app_page_category,#app_page_tag").find('input').change(function(){update_cates_and_tags()});
+}
+
+$(document).ready(function(){
+ update_cates_and_tags();
+ rebind();
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/page_edit.js.erb b/app/assets/javascripts/page_edit.js.erb
index 2585961a9..09326600b 100644
--- a/app/assets/javascripts/page_edit.js.erb
+++ b/app/assets/javascripts/page_edit.js.erb
@@ -43,7 +43,7 @@ $("#tag_list select").live('change', function() {
});
$("select.widget_field_select").live('change', function() {
- $.getScript(get_object_path() + '/reload_after_widget_field_changed?widget_field_value='+ $(this).val()+'&dom_id=' + $(this).attr("id") + '&field_seri=' +$(this).attr('field_seri'));
+ $.getScript(get_object_path() + '/reload_after_widget_field_changed?widget_field_value='+ $(this).val()+'&dom_id=' + $(this).attr("id") + '&field_seri=' +$(this).attr('field_seri')+ '&module_app_id=' +$("#page_module_app_id,page_part_module_app_id").val());
});
$('.part_kind').live('click', function() {
diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb
index 05e2181c5..fea1bf3f5 100644
--- a/app/controllers/admin/page_parts_controller.rb
+++ b/app/controllers/admin/page_parts_controller.rb
@@ -54,6 +54,7 @@ class Admin::PagePartsController < ApplicationController
end
def update
+
@part = PagePart.find(params[:id])
params[:page_part][:widget_field] = params[:page_part][:widget_field].zip( params[:page_part][:widget_field_type],params[:page_part][:widget_field_is_link] ) if params[:page_part][:widget_field]
@@ -63,6 +64,17 @@ class Admin::PagePartsController < ApplicationController
if params[:page_part][:module_app].blank?
params[:page_part][:module_app] = nil
end
+
+ if params[:page_part][:tag].include?("nil")
+ params[:page_part][:tag] = []
+ end
+
+ if params[:page_part][:category].include?("nil")
+ params[:page_part][:category] = []
+ end
+
+ params[:page_part][:widget_field].each{|t| t[2] = (t[2]=="true" ? true : false )}
+
if @part.update_attributes(params[:page_part])
set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
flash.now[:notice] = t('update.success.content')
@@ -96,6 +108,7 @@ class Admin::PagePartsController < ApplicationController
@part = PagePart.find params[:id]
@choosen_field = params[:widget_field_value]
@module_app = @part.module_app
+ @module_app = ModuleApp.find params[:module_app_id] if @module_app.nil?
end
def reload_widgets
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index 779302055..a5cba320a 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -96,6 +96,14 @@ helper Admin::PagePartsHelper
params[:page][:frontend_field] = params[:page][:frontend_field].zip( params[:page][:frontend_field_type] ) if params[:page][:frontend_field]
params[:page][:frontend_field_type] = nil
+ if params[:page][:tag].include?("nil")
+ params[:page][:tag] = []
+ end
+
+ if params[:page][:category].include?("nil")
+ params[:page][:category] = []
+ end
+
if @item.update_attributes(params[:page])
flash[:notice] = t('update.success.page')
respond_to do |format|
@@ -172,4 +180,12 @@ helper Admin::PagePartsHelper
end
end
+ def reload_widget_field
+ @index = params[:field_seri].to_i
+ @page = Page.find params[:id]
+ @choosen_field = params[:widget_field_value]
+ @module_app = @page.module_app
+ @module_app = ModuleApp.find params[:module_app_id] if @module_app.nil?
+ end
+
end
diff --git a/app/controllers/default_widget_controller.rb b/app/controllers/default_widget_controller.rb
index bb7600eb1..686a03163 100644
--- a/app/controllers/default_widget_controller.rb
+++ b/app/controllers/default_widget_controller.rb
@@ -10,12 +10,33 @@ class DefaultWidgetController< OrbitWidgetController
@page_part.module_app.enable_frontend?
end
+ def query_for_default_widget
+ ori_class_name = @default_widget["query"].split('.')[0]
+ result = nil
+ result_objects = nil
+ if !params["tag_id"].blank?
+ @tags = Tag.find(params["tag_id"]) rescue nil
+ result_ids = nil
+ if params["category_id"].blank?
+ result_ids = @tags.collect{|tag| tag.send(ori_class_name.downcase.pluralize).entries.collect{|t| t.id}}.flatten
+ else
+ result_ids = @tags.collect{|tag| tag.send(ori_class_name.downcase.pluralize).where(:category_id=>params["category_id"]).available_for_lang(I18n.locale).can_display.collect{|t| t.id}}.flatten
+ end
+ result = eval("#{ori_class_name}.where(:id=>result_ids)")
+ elsif params["category_id"].blank?
+ result = eval(@default_widget["query"])
+ else
+ result = eval("#{ori_class_name}.where(:category_id=>params['category_id'])")
+ end
+ result.available_for_lang(I18n.locale).can_display
+ end
+
def default_widget
+
if !params[:id].blank?
redirect_to eval("#{@page_part.module_app.widget_fields_link_method['title']['method']}('#{params[:id]}', {inner: #{params[:inner] || true}})")
else
@tag_class = nil
-
@default_widget = @page_part.module_app.get_default_widget
@widget_image_field = @default_widget["image"] || @default_widget[:image]
case @page_part
@@ -29,9 +50,11 @@ class DefaultWidgetController< OrbitWidgetController
@data_limit = @page_part.widget_data_count.is_a?(Fixnum) ? @page_part.widget_data_count : (@page_part.widget_data_count.to_i rescue 3)
end
if @paginate
- @data = eval(@default_widget["query"]).includes(@widget_image_field).page(params[:page_main]).per(@data_limit).desc(:created_at)
+ @data = query_for_default_widget.includes(@widget_image_field).page(params[:page_main]).per(@data_limit)
+ # @data = query_for_default_widget.limit(@data_limit).includes(@widget_image_field)
else
- @data = eval(@default_widget["query"]).limit(@data_limit).includes(@widget_image_field).desc(:created_at)
+ @data = eval(@default_widget["query"]).includes(@widget_image_field).page(params[:page_main]).per(@data_limit).desc(:created_at)
+ # @data = eval(@default_widget["query"]).limit(@data_limit).includes(@widget_image_field).desc(:created_at)
end
case params[:type]
when "typeA"
diff --git a/app/helpers/admin/page_parts_helper.rb b/app/helpers/admin/page_parts_helper.rb
index 898b139ef..b285cfa47 100644
--- a/app/helpers/admin/page_parts_helper.rb
+++ b/app/helpers/admin/page_parts_helper.rb
@@ -21,11 +21,10 @@ module Admin::PagePartsHelper
end
end
- def field_link_switch(i,object_name,field_name,local_item=nil,prefill_value=nil)
+ def link_to_field_switch(i,object_name,field_name,local_item=nil,prefill_value=nil) #link_to_field is for showing
local_item = @part if local_item.nil? && @part
local_item = @page if local_item.nil? && @page
res = ''
-
choosen_value = prefill_value || (local_item[:widget_field][i][0] rescue nil)
if choosen_value
@@ -38,13 +37,13 @@ module Admin::PagePartsHelper
if choosen_field_is_link
value = case local_item
when Page
- local_item[:frontend_field][i][2]
+ local_item[:frontend_field][i][2] rescue false
when PagePart
- local_item[:widget_field][i][2]
+ local_item[:widget_field][i][2] rescue false
end
-
+
res = label_tag '' do
- check_box_tag("#{object_name}[#{field_name}_is_link][]", value = "true", value) + I18n.t("default_widget.field_is_link")
+ check_box_tag("#{object_name}[#{field_name}_is_link][]", "true", value) + I18n.t("default_widget.field_is_link")
end
else # choosen_field_not_link
res = hidden_field_tag "#{object_name}[#{field_name}_is_link][]", 'false'
@@ -84,17 +83,17 @@ module Admin::PagePartsHelper
def tag_checked_value(part,radio_value)
if radio_value.blank?
- (part.nil? || part[:tag].blank?)? true : false
+ (part.nil? || part[:tag].blank?) ? true : false
else
- part and (part[:tag] == radio_value.to_s) ? true : false
+ part and (part[:tag].include?(radio_value.to_s)) ? true : false
end
end
def category_checked_value(part,radio_value)
if radio_value.blank?
- (part.nil? || part[:category].blank?)? true : false
+ (part.nil? || part[:category].blank?) ? true : false
else
- part and (part[:category] == radio_value.to_s) ? true : false
+ part and (part[:category].include?(radio_value.to_s)) ? true : false
end
end
@@ -117,6 +116,19 @@ module Admin::PagePartsHelper
end
end
+ def nil_checkbox_button(part,tag_or_cate)
+ field_name = case part
+ when PagePart
+ 'page_part'
+ when Page
+ 'page'
+ end
+ content_tag :label,:class=>"radio inline" do
+ op = check_box_tag("#{field_name}[#{tag_or_cate}][]", 'nil' , eval("#{tag_or_cate}_checked_value(part,'')"),:class=>'select_all')
+ op << I18n.t("default_widget.no_value")
+ end
+ end
+
def nil_radio_button(part,tag_or_cate)
field_name = case part
when PagePart
diff --git a/app/helpers/default_widget_helper.rb b/app/helpers/default_widget_helper.rb
index 1d73acc83..af2ac2393 100644
--- a/app/helpers/default_widget_helper.rb
+++ b/app/helpers/default_widget_helper.rb
@@ -6,7 +6,7 @@ module DefaultWidgetHelper
def link_to_field(row_data,field, switch, options=nil)
method_ary = @page_part.module_app.widget_fields_link_method
field = field.to_sym
- if(method_ary.has_key?(field) and (switch == "true"))
+ if(method_ary.has_key?(field) and (switch == true))
url = case method_ary[field][:args]
when nil # no args
get_data_link(method_ary[field]["method"], options)
@@ -51,7 +51,7 @@ module DefaultWidgetHelper
eval eval("#{method_entry}(#{options})")
when BSON::ObjectId
object = "'#{object.to_s}'"
- eval("#{method_entry}(#{{:id => object}.merge options})")
+ eval("#{method_entry}(#{{:id => object}.merge options})")
when Hash
eval("#{method_entry}(#{object.merge options})")
else
diff --git a/app/models/page.rb b/app/models/page.rb
index 1f13d64cf..be9c02e77 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -8,8 +8,8 @@ class Page < Item
field :content, localize: true
field :app_frontend_url
field :theme_id, :type => BSON::ObjectId, :default => nil
- field :category, :default => ''
- field :tag, :default => ''
+ field :category,type: Array, :default => []
+ field :tag, type: Array,:default => []
field :view_count, :type => Integer, :default => 0
field :page_title, localize: true
diff --git a/app/models/page_part.rb b/app/models/page_part.rb
index b48c80605..4b0d4a8c7 100644
--- a/app/models/page_part.rb
+++ b/app/models/page_part.rb
@@ -11,6 +11,8 @@ class PagePart
field :public_r_tag_option, :default => nil
field :page_title, localize: true
field :widget_path
+ field :category,type: Array, :default => []
+ field :tag, type: Array,:default => []
field :widget_style
field :widget_field , :type => Array
diff --git a/app/views/admin/page_parts/_default_widget_setting.html.erb b/app/views/admin/page_parts/_default_widget_setting.html.erb
index f45461784..3e7d2689e 100644
--- a/app/views/admin/page_parts/_default_widget_setting.html.erb
+++ b/app/views/admin/page_parts/_default_widget_setting.html.erb
@@ -2,11 +2,9 @@
<% when PagePart %>
<% object_name = 'page_part' %>
<% field_name = 'widget_field' %>
- <% data_count = 'widget_data_count' %>
<% when Page %>
<% object_name = 'page' %>
<% field_name = 'frontend_field' %>
- <% data_count = 'frontend_data_count' %>
<% end %>
@@ -37,20 +35,9 @@
<%= select_tag "#{object_name}[#{field_name}_type][]", widget_fiield_type_options(i), :include_blank => true %>
- <%= field_link_switch(i,object_name,field_name) %>
+ <%= link_to_field_switch(i,object_name,field_name) %>
<% end %>
-
-
-
- <%= label_tag t("default_widget.widget_data_count") %>
-
-
-
-
- <%= text_field_tag "#{object_name}[#{data_count}]",object.send(data_count) %>
-
-
\ No newline at end of file
diff --git a/app/views/admin/page_parts/_edit.html.erb b/app/views/admin/page_parts/_edit.html.erb
index 812f50c77..79cc057d1 100644
--- a/app/views/admin/page_parts/_edit.html.erb
+++ b/app/views/admin/page_parts/_edit.html.erb
@@ -19,3 +19,5 @@
<% end %>
+
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
\ No newline at end of file
diff --git a/app/views/admin/page_parts/_module_widget.html.erb b/app/views/admin/page_parts/_module_widget.html.erb
index e1f812633..0862ae294 100644
--- a/app/views/admin/page_parts/_module_widget.html.erb
+++ b/app/views/admin/page_parts/_module_widget.html.erb
@@ -45,3 +45,8 @@
<%= render :partial => 'widget_setting' ,:locals=>{:f=>f,:object=>@part} %>
+
+
+ <%= render :partial=>'admin/pages/data_count_field',:locals=>{:field_name=>"page_part[widget_data_count]",:field_value=>@part.widget_data_count } %>
+
+
diff --git a/app/views/admin/page_parts/_widget_data_source_category.html.erb b/app/views/admin/page_parts/_widget_data_source_category.html.erb
index d088c6452..c3e4c21d3 100644
--- a/app/views/admin/page_parts/_widget_data_source_category.html.erb
+++ b/app/views/admin/page_parts/_widget_data_source_category.html.erb
@@ -10,9 +10,9 @@
<% if @categories %>
- <%= nil_radio_button(object,:category) %>
+ <%= nil_checkbox_button(object,:category) %>
<%= content_tag_for(:label, @categories,:class=>"radio inline") do |category|%>
- <%= radio_button_tag("#{field_name}[category]", category.id, category_checked_value(object,category.id) )%>
+ <%= check_box_tag("#{field_name}[category][]", category.id, category_checked_value(object,category.id),:class=>'select_option' )%>
<%= category.title%>
<% end %>
diff --git a/app/views/admin/page_parts/_widget_data_source_tag.html.erb b/app/views/admin/page_parts/_widget_data_source_tag.html.erb
index bcb3e9c3b..c067aeded 100644
--- a/app/views/admin/page_parts/_widget_data_source_tag.html.erb
+++ b/app/views/admin/page_parts/_widget_data_source_tag.html.erb
@@ -10,9 +10,9 @@
<% if @categories %>
- <%= nil_radio_button(object,:tag) %>
+ <%= nil_checkbox_button(object,:tag) %>
<%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
- <%= radio_button_tag("#{field_name}[tag]", tag.id, tag_checked_value(object,tag.id) ) %>
+ <%= check_box_tag("#{field_name}[tag][]", tag.id, tag_checked_value(object,tag.id),:class=>'select_option' ) %>
<%= tag[I18n.locale]%>
<% end if @tags%>
diff --git a/app/views/admin/page_parts/edit.html.erb b/app/views/admin/page_parts/edit.html.erb
index 907cc7eb0..b65781295 100644
--- a/app/views/admin/page_parts/edit.html.erb
+++ b/app/views/admin/page_parts/edit.html.erb
@@ -2,4 +2,8 @@
<%= render 'admin/items/site_map_left_bar' %>
<% end -%>
+
+
+
+
<%= render 'edit' %>
\ No newline at end of file
diff --git a/app/views/admin/page_parts/reload_widget_field.js.erb b/app/views/admin/page_parts/reload_widget_field.js.erb
index 32482e51b..ae8d75f22 100644
--- a/app/views/admin/page_parts/reload_widget_field.js.erb
+++ b/app/views/admin/page_parts/reload_widget_field.js.erb
@@ -1 +1 @@
-$("#<%= params[:dom_id] %>").parents(".rows").find(".link_switch_holder").html("<%= j field_link_switch(@index,'page_part','widget_field',nil,@choosen_field) %>");
\ No newline at end of file
+$("#<%= params[:dom_id] %>").parents(".rows").find(".link_switch_holder").html("<%= j link_to_field_switch(@index,'page_part','widget_field',nil,@choosen_field) %>");
\ No newline at end of file
diff --git a/app/views/admin/page_parts/reload_widgets.js.erb b/app/views/admin/page_parts/reload_widgets.js.erb
index c32e07c28..4e1621678 100644
--- a/app/views/admin/page_parts/reload_widgets.js.erb
+++ b/app/views/admin/page_parts/reload_widgets.js.erb
@@ -2,7 +2,7 @@
$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|k,v| [I18n.t(v['i18n']),k]},@part.widget_path) %>");
$("#widget_data_source_category").html("<%= j render :partial => 'widget_data_source_category',:locals=>{:object=>@part} %>");
$("#widget_data_source_tag").html("<%= j render :partial => 'widget_data_source_tag',:locals=>{:object=>@part} %>");
-
+ $("#data_count").html("<%= j render :partial => 'admin/pages/data_count_field',:locals=>{:field_name=>'page_part[widget_data_count]',:field_value=>@part.widget_data_count } %>");
<% if @part %>
<% if show_default_widget_setting_panel %>
$('#widget_setting').html("<%= j render :partial => 'default_widget_style_panel' %>");
@@ -16,3 +16,5 @@
$('#widget_setting').html("<%=j render :partial=> 'reset',:locals=>{:label_i18n=>'default_widget.select_widget_style'}%>");
$('#widget_list select').html("<%= j options_for_select([]) %>");
<% end %>
+update_cates_and_tags();
+rebind();
\ No newline at end of file
diff --git a/app/views/admin/pages/_data_count_field.html.erb b/app/views/admin/pages/_data_count_field.html.erb
new file mode 100644
index 000000000..48f355f06
--- /dev/null
+++ b/app/views/admin/pages/_data_count_field.html.erb
@@ -0,0 +1,6 @@
+
+ <%= t("default_widget.widget_data_count") %>
+
+
+ <%= select_tag(field_name,options_for_select(@module_app.get_registration.get_data_count,field_value )) %>
+
\ No newline at end of file
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 8198cda6b..d3308bc6d 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -66,6 +66,9 @@
<%= render :partial => 'frontend_setting', :locals=>{:object=>@item,:f=>f} %>
+
+ <%= render :partial=>'data_count_field',:locals=>{:field_name=>"page[frontend_data_count]",:field_value=>@item.frontend_data_count} %>
+
<%= f.label :is_published, "#{t('front_page.is_published')} ?", :class => 'control-label' %>
@@ -109,3 +112,4 @@
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
\ No newline at end of file
diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb
index 8bd766342..701b7ae0c 100644
--- a/app/views/admin/pages/edit.html.erb
+++ b/app/views/admin/pages/edit.html.erb
@@ -3,4 +3,4 @@
<%= render 'admin/items/site_map_left_bar' %>
<% end -%>
-<%= render 'edit' %>
+<%= render 'edit' %>
\ No newline at end of file
diff --git a/app/views/admin/pages/reload_frontend_pages.js.erb b/app/views/admin/pages/reload_frontend_pages.js.erb
index 09f0e13a9..215ec3fbc 100644
--- a/app/views/admin/pages/reload_frontend_pages.js.erb
+++ b/app/views/admin/pages/reload_frontend_pages.js.erb
@@ -1,7 +1,8 @@
<% if @module_app %>
$('#app_page_category').html("<%= j render :partial => 'admin/page_parts/widget_data_source_category' ,:locals=>{:object=>@page}%>");
$('#app_page_tag').html("<%= j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
-
+ $("#data_count").html("<%= j render :partial => 'admin/pages/data_count_field',:locals=>{:field_name=>'page[frontend_data_count]',:field_value=>@page.frontend_data_count} %>");
+
<% if !@module_app.app_pages.blank? %>
$('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', options_for_select(@app_frontend_urls, @app_frontend_urls.first)) %>");
<%else %>
@@ -31,3 +32,5 @@
$('#app_page_url').html("<%= t('default_widget.no_support_setting')%>");
$('#frontend_setting').html("<%= j render :partial => 'custom_frontend_setting' %>");
<% end %>
+update_cates_and_tags();
+rebind();
\ No newline at end of file
diff --git a/app/views/admin/pages/reload_widget_field.js.erb b/app/views/admin/pages/reload_widget_field.js.erb
new file mode 100644
index 000000000..0f6bd1f7b
--- /dev/null
+++ b/app/views/admin/pages/reload_widget_field.js.erb
@@ -0,0 +1 @@
+$("#<%= params[:dom_id] %>").parents(".rows").find(".link_switch_holder").html("<%= j link_to_field_switch(@index,'page','frontend_field',nil,@choosen_field) %>");
\ No newline at end of file
diff --git a/app/views/default_widget/_typeB.html.erb b/app/views/default_widget/_typeB.html.erb
index fcf70065e..ff2b8bdde 100644
--- a/app/views/default_widget/_typeB.html.erb
+++ b/app/views/default_widget/_typeB.html.erb
@@ -13,5 +13,4 @@
<% end %>
<% end %>
- more
<% end %>
diff --git a/app/views/default_widget/_typeC.html.erb b/app/views/default_widget/_typeC.html.erb
index d3b3e49fe..24729b088 100644
--- a/app/views/default_widget/_typeC.html.erb
+++ b/app/views/default_widget/_typeC.html.erb
@@ -11,5 +11,4 @@
<% end %>
<% end %>
- more
<% end %>
diff --git a/app/views/default_widget/default_widget.html.erb b/app/views/default_widget/default_widget.html.erb
index b134d8ad5..fe46de2c2 100644
--- a/app/views/default_widget/default_widget.html.erb
+++ b/app/views/default_widget/default_widget.html.erb
@@ -1,4 +1,7 @@
<%= render @partial %>
<% if @paginate %>
<%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %>
-<% end %>
\ No newline at end of file
+<% end %>
+<% if @page_part.module_app %>
+ <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
+<% end %>
diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index 57f205a65..c61aec8e2 100644
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -11,7 +11,7 @@
-
+
diff --git a/config/routes.rb b/config/routes.rb
index cc272ffca..8ceb71c99 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,6 +90,7 @@ Orbit::Application.routes.draw do
get 'reload_themes'
get 'reload_after_module_changed',:action=>'reload_frontend_pages'
get 'reload_after_list_changed',:action=> 'reload_front_end_setting'
+ get 'reload_after_widget_field_changed',:action=> 'reload_widget_field'
end
end
diff --git a/db/seeds.rb b/db/seeds.rb
index a0458dd15..efcbb2747 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,54 +5,4 @@ FactoryGirl.definition_file_paths = Dir["#{Rails.root}/vendor/built_in_modules/*
FactoryGirl.find_definitions
-
-ConferenceCoAuthorRelation.destroy_all
-ConferenceCoAuthor.destroy_all
-ConferencePaperType.destroy_all
-WritingConferenceFile.destroy_all
-WritingConference.destroy_all
-#Dir[Rails.root.join("spec/factories/*.rb")].each {|f| require f}
-
-
-2.times do
- FactoryGirl.create(:conference_paper_type)
-end
-
-10.times do
- FactoryGirl.create(:conference_co_author_relation)
-end
-
-50.times do
- FactoryGirl.create(:conference_co_author)
-end
-
-50.times do
- FactoryGirl.create(:writing_conference)
-end
-
-puts "Success!"
-
-# =======
-#
-#CoAuthorRelation.destroy_all
-#CoAuthor.destroy_all
-#JournalLevelType.destroy_all
-#WritingJournalFile.destroy_all
-#WritingJournal.destroy_all
-#
-#10.size.times do
-# FactoryGirl.create(:journal_level)
-#end
-#
-#10.times do
-# FactoryGirl.create(:journal_relation)
-#end
-#
-#50.times do
-# FactoryGirl.create(:journal)
-#end
-#
-#50.times do
-# FactoryGirl.create(:journal_co_author)
-#end
-#puts "Success!"
+Dir["#{Rails.root}/vendor/built_in_modules/*/db/seeds.rb"].each { |seed| load seed }
diff --git a/lib/orbit_app.rb b/lib/orbit_app.rb
index 5b20f7a56..0d801751e 100644
--- a/lib/orbit_app.rb
+++ b/lib/orbit_app.rb
@@ -3,6 +3,7 @@ require "orbit_app/dsl"
require "orbit_app/helper/renderer"
require "orbit_app/helper/side_bar_renderer"
require "orbit_app/helper/context_link_renderer"
+require "orbit_app/helper/default_widget_tag_helper"
require "orbit_app/module/side_bar"
require "orbit_app/module/widget"
require "orbit_app/module/front_end"
diff --git a/lib/orbit_app/helper/default_widget_tag_helper.rb b/lib/orbit_app/helper/default_widget_tag_helper.rb
new file mode 100644
index 000000000..52160398b
--- /dev/null
+++ b/lib/orbit_app/helper/default_widget_tag_helper.rb
@@ -0,0 +1,12 @@
+module DefaultWidgetTagHelper
+ include Renderer
+ include AdminHelper
+
+ def link_to_more_tag(req,params)
+ @request = req
+ @params =params
+ content_tag :div,:class=> 'more' do
+ link_to I18n.t(@more_link[:label_i18n]),eval(@more_link[:path_method])
+ end
+ end
+end
\ No newline at end of file
diff --git a/lib/orbit_app/module/registration.rb b/lib/orbit_app/module/registration.rb
index 9856f7d33..5dbc36054 100644
--- a/lib/orbit_app/module/registration.rb
+++ b/lib/orbit_app/module/registration.rb
@@ -28,7 +28,7 @@ module OrbitApp
end
class DataSheet
- attr_reader :name,:key,:base_path,:module_label
+ attr_reader :name,:key,:base_path,:module_label,:data_count
def initialize(name, &block)
@name = name
@@ -36,6 +36,7 @@ module OrbitApp
@side_bar = nil
@front_end_app_pages = nil
@module_label = 'rulingcom.errors.init.module_app_noname'
+ @data_count = 1..15 # as default
block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
setup_module_app
end
@@ -86,6 +87,10 @@ module OrbitApp
@front_end_app_pages.nil? ? [] : @front_end_app_pages.to_module_app_format
end
+ def get_data_count
+ @data_count
+ end
+
def get_widget_by_path(path)
if @widget_set
@widget_set.find_by_path(path)
@@ -94,6 +99,14 @@ module OrbitApp
end
end
+ def default_widget_setting
+ @widget_set.default_widget_setting
+ end
+
+ def widget_setting
+ @widget_set
+ end
+
def get_widgets
@widget_set.nil? ? {} : @widget_set.to_module_app_format
end
@@ -127,7 +140,7 @@ module OrbitApp
# @default_widget = widget_set.default_widget
end
- %w{module_label category base_url version organization author intro update_info}.each do |field|
+ %w{data_count module_label category base_url version organization author intro update_info}.each do |field|
define_method(field){|var| instance_variable_set( "@" + field, var)}
end
diff --git a/lib/orbit_app/module/widget.rb b/lib/orbit_app/module/widget.rb
index 7e99b2a99..3389b5b15 100644
--- a/lib/orbit_app/module/widget.rb
+++ b/lib/orbit_app/module/widget.rb
@@ -34,6 +34,10 @@ module OrbitApp
define_method(field){|var| instance_variable_set( "@" + field, var)}
end
+ # def data_count(var)
+ # @data_count = var
+ # end
+
def find_by_path(path)
@widgets.each do |widget|
return widget if widget.name == path
@@ -44,10 +48,14 @@ module OrbitApp
eval(@categories_query) rescue nil
end
- def get_tags
+ def get_tags
eval(@tags_query) rescue nil
end
+ def default_widget_setting
+ @default_widget
+ end
+
def default_widget(&block)
@default_widget = DefaultWidget.new(&block)
end
@@ -85,6 +93,7 @@ module OrbitApp
end
class DefaultWidget
+ include DefaultWidgetTagHelper
STYLE = ["typeA","typeB_style2","typeB_style3","typeB_style4","typeC"]
def initialize(&block)
@@ -95,9 +104,10 @@ module OrbitApp
block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
end
- def more_link_to(label_i18n,path_method)
- @more_link[:label_i18n] = label_i18n
- @more_link[:path_method] = path_method
+
+ def link_to_more(*args)
+ @more_link[:label_i18n] = (args[1] ? args[1][:title_i18n] : 'default_widget.default_link_to_more' )
+ @more_link[:path_method] = args[0]
end
def self.get_interface_args
@@ -106,7 +116,7 @@ module OrbitApp
end
def to_module_app_format
- {"query"=>@query,"image"=>@image} rescue nil
+ {"query"=>@query,"image"=>@image,"more_link"=>@more_link} rescue nil
end
def link_field(field_name,setting)
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 1e498c1e2..fe331c6cd 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -190,6 +190,25 @@ namespace :migrate do
end
end
+ task :convert_cate_tag_type => :environment do
+ [Page,PagePart].each do |obj|
+ obj.all.each do |pp|
+ if pp.category.blank?
+ pp.category = []
+ else
+ pp.category = [pp.category]
+ end
+
+ if pp.tag.blank?
+ pp.tag = []
+ else
+ pp.tag = [pp.tag]
+ end
+ pp.save
+ end
+ end
+ end
+
task :clean_parts => :environment do
PagePart.where(widget_style: /\d/, kind: 'module_widget').each{|part| part.update_attributes({kind: 'text', widget_style: nil, widget_field: nil})}
PagePart.where(widget_style: /\d/).each{|part| part.update_attributes({widget_style: nil, widget_field: nil})}
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index d24c12658..457690289 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -27,6 +27,7 @@ zh_tw:
approval_setting: 審核權限
tags: 標籤
default_widget:
+ to_more: 更多
bulletin_category_with_title: 分類
title: 標題
postdate: 張貼日期
diff --git a/vendor/built_in_modules/announcement/init.rb b/vendor/built_in_modules/announcement/init.rb
index 2dd1628ab..ab54a4384 100644
--- a/vendor/built_in_modules/announcement/init.rb
+++ b/vendor/built_in_modules/announcement/init.rb
@@ -18,6 +18,7 @@ module Announcement
end
category ["BulletinCategory"]
+ data_count 3..10
widgets do
default_widget do
@@ -26,6 +27,7 @@ module Announcement
field :postdate
link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
+ link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'announcement.default_widget.to_more'
end
categories_query 'BulletinCategory.all'
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
index 8ca6ae699..2021e94e0 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
@@ -1,7 +1,7 @@
class Panel::PersonalConference::Desktop::ConferencePagesController < ApplicationController
def index
@view_by = params[:view]
- @writing_conferences = WritingConference.all
+ @writing_conferences = WritingConference.where(create_user_id: current_user.id)
if @view_by.nil?
@writing_conferences = @writing_conferences.asc(:paper_title)
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
index d8b4451a2..5b4db5fc1 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
@@ -8,7 +8,7 @@
- <%= submit_tag "Back", :type => "button", class: "bt-cancel fn_btn ini_input hp hh2 thmtxt" %>
+ <%= submit_tag "Back", :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_co_authors_path, class: "bt-cancel fn_btn ini_input hp hh2 thmtxt" %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
index 0df7a876c..22efcbf58 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
@@ -1,7 +1,7 @@
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index 8c5eb261a..fd6e59c92 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -3,7 +3,7 @@
<%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
<% if not @writing_conference.new_record? %>
- <%= submit_tag t("cancel"), :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %>
+ <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %>
<% end %>
@@ -146,7 +146,7 @@
<%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]', :class => "s_grid_4 s_grid"} ) %>
-
>
+ >
<%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_6 s_grid full_height"%>
diff --git a/vendor/built_in_modules/personal_conference/db/seeds.rb b/vendor/built_in_modules/personal_conference/db/seeds.rb
new file mode 100644
index 000000000..d29669627
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/db/seeds.rb
@@ -0,0 +1,25 @@
+
+ConferenceCoAuthorRelation.destroy_all
+ConferenceCoAuthor.destroy_all
+ConferencePaperType.destroy_all
+WritingConferenceFile.destroy_all
+WritingConference.destroy_all
+
+
+2.times do
+ FactoryGirl.create(:conference_paper_type)
+end
+
+10.times do
+ FactoryGirl.create(:conference_co_author_relation)
+end
+
+50.times do
+ FactoryGirl.create(:conference_co_author)
+end
+
+50.times do
+ FactoryGirl.create(:writing_conference)
+end
+
+puts "Conference sample data import success!"
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb
deleted file mode 100644
index 3526d6ff0..000000000
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Panel::PersonalJournal::Desktop::JournalPController < ApplicationController
- def journal_p
- render panel_personal_journal_desktop_journal_p_path, :layout => false
- end
-end
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
index 83f9408de..eff597fbf 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
@@ -1,7 +1,16 @@
class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationController
def index
- @writing_journal = WritingJournal.where(create_user_id: current_user.id)
+ @writing_journals = WritingJournal.where(create_user_id: current_user.id)
@level_types = JournalLevelType.all
+ @view_by = params[:view]
+
+ if @view_by.nil?
+ @writing_journals = @writing_journals.asc(:paper_title)
+ else
+ @writing_journals = @writing_journals.asc(@view_by).asc(:paper_title)
+ end
+
+ @level_types = ConferencePaperType.all
respond_to do |format|
format.html { render :layout => false}
@@ -73,37 +82,6 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
render :json => {success: true, msg: t('delete.success.paper')}
end
- def get_journals_json
- publications = WritingJournal.where(create_user_id: current_user.id)
-
- sort_publications= Hash.new
- data = Array.new
-
- publications.each do |publication|
- if sort_publications[publication.journal_title].nil?
- sort_publications[publication.journal_title] = Array.new
- end
- sort_publications[publication.journal_title] <<
- { title: publication.paper_title,
- keywords: publication.keywords,
- abstract: publication.abstract,
- coauthors: publication.authors,
- year: publication.year,
- url_edit: edit_panel_personal_journal_desktop_journal_page_path(publication),
- url_delete: panel_personal_journal_desktop_journal_page_path(publication),
- files: publication.writing_journal_files.collect{|file|
- {title: file.title, url: file.file.url, icon: check_file_type(file.file.url)}
- }
- }
- end
-
- sort_publications.each do |journal, papers|
- data << {title: journal, papers: papers}
- end
-
- render json: JSON.pretty_generate(data)
- end
-
def journal_type
level_types = JournalLevelType.all
all_journal_lists = WritingJournal.where(create_user_id: current_user.id)
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_windows_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_windows_controller.rb
new file mode 100644
index 000000000..52a8df064
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_windows_controller.rb
@@ -0,0 +1,5 @@
+class Panel::PersonalJournal::Desktop::JournalWindowsController < ApplicationController
+ def journal_window
+ render panel_personal_journal_desktop_journal_window_path, :layout => false
+ end
+end
diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/.gitkeep b/vendor/built_in_modules/personal_journal/app/helpers/panel/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
new file mode 100644
index 000000000..bdddd92ec
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
@@ -0,0 +1,74 @@
+module Panel::PersonalJournal::Desktop::JournalPagesHelper
+ def publication_record publication, view
+ content_tag :li,
+ :class => "list_t_item" do
+ marker + \
+ content(publication, view) + \
+ edit_or_delete(publication)
+ end
+ end
+
+ def marker
+ content_tag :div,
+ :class => "list_item_action"
+ content_tag(:a, "", :class => "icon-check-empty") + \
+ content_tag(:a, "", :class => "icon-star-empty")
+ end
+
+ def content publication, view
+ case view
+ when "journal_title"
+ des = content_tag(:div, publication.journal_title,
+ :class => "list_t_des")
+ when "keywords"
+ des = content_tag(:div, publication.keywords,
+ :class => "list_t_des")
+ when "abstract"
+ des = content_tag(:div, publication.abstract,
+ :class => "list_t_des")
+ when "file"
+ des = content_tag(:div, link_publication_file(publication),
+ :class => "list_t_des")
+ else
+ end
+
+ content_tag(:div, publication.paper_title,
+ :class => "list_t_title") + des
+
+ end
+
+ def edit_or_delete publication
+ content_tag :div,
+ :class => "list_item_function" do
+ content_tag(:a, t("edit"),
+ :class => "journal_paper_edit admbg2 admtxt",
+ :href => edit_panel_personal_journal_desktop_journal_page_path(publication),
+ "ajax-remote" => "get") + \
+ content_tag(:a, t("delete"),
+ "ajax-remote" => "delete",
+ "confirm-message" => t("sure?"),
+ "callback-method" => "paperDelete",
+ :class => "journal_paper_delete admbg2 admtxt",
+ :href => panel_personal_journal_desktop_journal_page_path(publication))
+ end
+ end
+
+ def link_publication_file publication
+ publication.writing_journal_files.map{|file|
+ link_to(image_tag(check_file_type(file.file.url)) + \
+ content_tag(:span, file.title, :class => "filetitle"),
+ file.file.url,
+ :class => "file",
+ "target" => "_blank")
+ }.inject(:+)
+ end
+
+ def check_file_type file
+ if not file.nil?
+ file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
+ file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
+ else
+ file_type = ""
+ end
+ end
+end
diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
index 64f123f05..7374abbf4 100644
--- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
+++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
@@ -47,11 +47,11 @@ class WritingJournal
current_user = update_user_id
end
- authors_db = CoAuthor.where(:name_id => current_user).map(&:co_author)
+ authors_db = JournalCoAuthor.where(:name_id => current_user).map(&:co_author)
authors_list.delete(User.find(current_user).name)
authors_list = authors_list.delete_if{|author| authors_db.include?author}
authors_list.each do |author|
- CoAuthor.new(:co_author => author, :name_id => current_user).save
+ JournalCoAuthor.new(:co_author => author, :name_id => current_user).save
end
end
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
index c6f9ef531..bffde52fa 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
@@ -1,4 +1,4 @@
-<%= f.text_field :journal_co_author_relation %>
+<%= f.text_field :relation %>
<% if not @writing_journal.new_record? %>
- <%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %>
+ <%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %>
<% end %>
@@ -143,7 +142,7 @@
- <%= f.text_field :tags, size: "20", placeholder: t("personal_journal.tags"), class: "s_grid_6 s_grid"%>
+ >
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
index 4a351773c..c3a346e8b 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
@@ -41,11 +41,11 @@
View
- Journal
- Title
- File
- Keywords
- Abstract
+ <%= link_to "Journal", panel_personal_journal_desktop_journal_pages_path + "?view=journal_title", :class => "hp hh2 admtxt", "ajax-remote" => "get" %>
+ <%= link_to "Title", panel_personal_journal_desktop_journal_pages_path + "?view=paper_title", :class => "hp hh2 admtxt", "ajax-remote" => "get" %>
+ <%= link_to "File", panel_personal_journal_desktop_journal_pages_path + "?view=file", :class => "hp hh2 admtxt", "ajax-remote" => "get" %>
+ <%= link_to "Keywords", panel_personal_journal_desktop_journal_pages_path + "?view=keywords", :class => "hp hh2 admtxt", "ajax-remote" => "get" %>
+ <%= link_to "Abstract", panel_personal_journal_desktop_journal_pages_path + "?view=abstract", :class => "hp hh2 admtxt", "ajax-remote" => "get" %>
@@ -81,7 +81,9 @@
-
+ <% @writing_journals.each do |w| %>
+ <%= publication_record w, @view_by%>
+ <% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
similarity index 100%
rename from vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb
rename to vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
diff --git a/vendor/built_in_modules/personal_journal/config/routes.rb b/vendor/built_in_modules/personal_journal/config/routes.rb
index e9e5594f0..5a03564d1 100644
--- a/vendor/built_in_modules/personal_journal/config/routes.rb
+++ b/vendor/built_in_modules/personal_journal/config/routes.rb
@@ -2,7 +2,7 @@ Rails.application.routes.draw do
namespace :panel do
namespace :personal_journal do
namespace :desktop do
- match 'journal_p'=>'journal_p#journal_p'
+ match 'journal_window'=>'journal_windows#journal_window'
match 'get_journals_json' => 'journal_pages#get_journals_json'
match 'journal_type' => 'journal_pages#journal_type'
resources :journal_pages, except: :show
diff --git a/vendor/built_in_modules/personal_journal/db/seeds.rb b/vendor/built_in_modules/personal_journal/db/seeds.rb
new file mode 100644
index 000000000..2562f00f3
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/db/seeds.rb
@@ -0,0 +1,23 @@
+
+JournalCoAuthorRelation.destroy_all
+JournalCoAuthor.destroy_all
+JournalLevelType.destroy_all
+WritingJournalFile.destroy_all
+WritingJournal.destroy_all
+
+10.size.times do
+ FactoryGirl.create(:journal_level)
+end
+
+10.times do
+ FactoryGirl.create(:journal_co_author_relation)
+end
+
+50.times do
+ FactoryGirl.create(:writing_journal)
+end
+
+50.times do
+ FactoryGirl.create(:journal_co_author)
+end
+puts "Journal sample data import success!"
diff --git a/vendor/built_in_modules/personal_journal/spec/factories/journal_co_author_relations.rb b/vendor/built_in_modules/personal_journal/spec/factories/journal_co_author_relations.rb
index 4badc8a2d..ca7cfbe21 100644
--- a/vendor/built_in_modules/personal_journal/spec/factories/journal_co_author_relations.rb
+++ b/vendor/built_in_modules/personal_journal/spec/factories/journal_co_author_relations.rb
@@ -2,7 +2,7 @@
types = ["friend", "teacher", "student", "schoolmate", "parent", "best friend", "instructor", "labmate", "TA", "mate"]
FactoryGirl.define do
- factory(:journal_co_author_relation, class: "CoAuthorRelation") do |f|
+ factory(:journal_co_author_relation, class: "JournalCoAuthorRelation") do |f|
f.sequence(:relation_translations) do |n|
{ zh_tw: "#{types[n%types.size]}",
en: "#{types[n%types.size]}" }
diff --git a/vendor/built_in_modules/personal_journal/spec/factories/journal_co_authors.rb b/vendor/built_in_modules/personal_journal/spec/factories/journal_co_authors.rb
index ebfbded6e..17d15dd39 100644
--- a/vendor/built_in_modules/personal_journal/spec/factories/journal_co_authors.rb
+++ b/vendor/built_in_modules/personal_journal/spec/factories/journal_co_authors.rb
@@ -8,13 +8,13 @@ email = Array.new 51,""
email= email.map do |p| Faker::Internet.email end
FactoryGirl.define do
- factory(:journal_co_author, class: "CoAuthor") do |f|
+ factory(:journal_co_author, class: "JournalCoAuthor") do |f|
f.sequence(:co_author_translations) do |n|
{ zh_tw: "#{name_tw[n]}",
en: "#{name_en[n]}" }
end
- f.sequence(:co_author_relations_id) do |n| "#{CoAuthorRelation.all[n%CoAuthorRelation.count].id}" end
+ f.sequence(:journal_co_author_relations_id) do |n| "#{JournalCoAuthorRelation.all[n%JournalCoAuthorRelation.count].id}" end
f.sequence(:email) do |n| "#{email[n]}" end
f.name_id BSON::ObjectId('4f45f3b9e9d02c5db9000067') #user_id, this is Chris' account
end
diff --git a/vendor/built_in_modules/personal_journal/spec/factories/writing_journals.rb b/vendor/built_in_modules/personal_journal/spec/factories/writing_journals.rb
index bad765bb2..a402a91df 100644
--- a/vendor/built_in_modules/personal_journal/spec/factories/writing_journals.rb
+++ b/vendor/built_in_modules/personal_journal/spec/factories/writing_journals.rb
@@ -7,7 +7,7 @@ data_json = JSON.parse(data)
rand = Random.new
FactoryGirl.define do
- factory :journal, class: "WritingJournal" do |f|
+ factory :writing_journal, class: "WritingJournal" do |f|
f.sequence(:paper_title_translations) do |n|
{ zh_tw: "#{data_json[n]["paper_title"]}_tw",
en: "#{data_json[n]["paper_title"]}_en" }