diff --git a/.gitignore b/.gitignore
index b8a4c577b..d27ac7275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,10 @@ uploads/**/*
public/panel/**/*
public/index.html
.DS_Store
-
+solr/data/**/*
*.swp
-
+*.pid
+*.lck
public/assets
config/application.rb
diff --git a/Gemfile b/Gemfile
index 3ea8359e1..40270a735 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ gem 'mongoid-tree', :require => 'mongoid/tree'
gem "mongo_session_store-rails3"
gem 'mysql2'
gem 'nokogiri'
+
gem 'radius'
gem 'rake'
# gem 'remotipart'
@@ -84,7 +85,7 @@ group :test, :development do
gem "simplecov"
gem "delorean"
gem "watchr"
- gem "spork"
+ gem "spork"
# gem "capybara"
# gem 'yard'
# gem "bluecloth"
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 000000000..4f561da0f
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,22 @@
+guard 'livereload' do
+ watch(%r{app/.+\.(erb|haml)})
+ watch(%r{app/helpers/.+\.rb})
+ watch(%r{public/.+\.(css|js|html)})
+ watch(%r{config/locales/.+\.yml})
+end
+
+guard 'rspec', :version => 2 do
+ watch(%r{^spec/.+_spec\.rb})
+ watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+ watch('spec/spec_helper.rb') { "spec" }
+
+ # Rails example
+ watch('spec/spec_helper.rb') { "spec" }
+ watch('config/routes.rb') { "spec/routing" }
+ watch('app/controllers/application_controller.rb') { "spec/controllers" }
+ watch(%r{^spec/.+_spec\.rb})
+ watch(%r{^app/(.+)\.rb}) { |m| "spec/#{m[1]}_spec.rb" }
+ watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+ watch(%r{^app/controllers/(.+)_(controller)\.rb}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
+ watch(%r{^app/views/(.+)/}) { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
\ No newline at end of file
diff --git a/app/assets/javascripts/ajax_form.js.erb b/app/assets/javascripts/ajax_form.js.erb
index 917c352df..9f993cd1a 100644
--- a/app/assets/javascripts/ajax_form.js.erb
+++ b/app/assets/javascripts/ajax_form.js.erb
@@ -1,111 +1,7 @@
-<%#= encoding: utf-8 %>
-$(document).on('click', '#ajax_form_submit', function(){
- // $('#ajaxForm').ajaxSubmit({
- // beforeSubmit: function(a,f,o) {
- // o.dataType = 'script';
- // if (o.dataType == 'script') {
- // o.url = o.url.split('?'); // split on GET params
- // if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
- // o.url = o.url.join('?'); // join on GET params
- // }
- // },
- // success: function(response,status,xhr){
- // alert(response);
- // alert(status);
- // alert(xhr);
- // },
- // error:function(){
- // alert("error");
- // }
- // });
-
-
- var o = {
- // dataType: 'script',
- dataType: 'html',
- url:$("#ajaxForm").attr("action"),
- beforeSubmit: function(){
- var sub = true;
- $("span.error").remove();
- $("#dyn_error").empty();
- $("#ajaxForm input").each(function(){
- if($(this).val() == ""){
- $(" * ").insertAfter($(this));
- sub = false;
- }
- })
- if(!sub){
- $("#dyn_error").text("Cannot be empty.");
- $("#dyn_error").text("<%= I18n.t('cant_empty_star') %>");
- return false;
- }
- },
- success: function(response,status,xhr){
- if(typeof tinyMCEPopup != "undefined"){
- var x = response.split("#");
- var returnurl = x[0],
- returntitle = x[1],
- returndescription = x[2];
- var win = tinyMCEPopup.getWindowArg("window");
- win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
- win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription;
- win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle;
- if (typeof(win.ImageDialog) != "undefined") {
- // we are, so update image dimensions...
- if (win.ImageDialog.getImageData)
- win.ImageDialog.getImageData();
-
- // ... and preview if necessary
- if (win.ImageDialog.showPreviewImage)
- win.ImageDialog.showPreviewImage(returnurl);
- }
- tinyMCEPopup.close();
- }else{
- //incase if we want to do something for quick edit file upload
- // var modalvalues = "";
- // var r = "";
- // if(rcom.getInternetExplorerVersion() > -1){
- // r = "" + response + " ");
- // r = r.replace("**"," ");
- // r = $(r);
- // modalvalues = r.find("span").attr("data-content").split("#");
- // r.attr("id",r.find("span").attr("for"));
- // var table=document.getElementById(modalvalues[0]);
- // //var tbody = table.getElementsByTagName("tbody");
- // var row = table.insertRow(table.rows.length-1);
- // var c1 = row.insertCell(0),
- // c2 = row.insertCell(1),
- // c3 = row.insertCell(2);
- // c1.innerHTML = r.find("td").eq(0).html();
- // c2.innerHTML = r.find("td").eq(1).html();
- // c3.innerHTML = r.find("td").eq(2).html();
- // var trow = $("#bulletin_files tfoot").find("tr").eq(0);
- // $("#bulletin_files tbody").append(trow);
- // }else{
-
- // response = response.replace("**","");
- // response = response.replace("**","");
- // r = $(response);
- // modalvalues = r.find("span").attr("data-content").split("#");
- // $('#' + modalvalues[0]+ ' tbody').append(r);
- // }
- // console.log(modalvalues[1]);
- // $("#"+modalvalues[1]).modal('hide');
- //$('#bulletin_files tbody').append(r);
- //$(response).fadeIn();
- }
- },
- error:function(){
- alert("error");
- }
- }
-
- if (o.dataType == 'script') {
- o.url = o.url.split('?'); // split on GET params
- if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
- o.url = o.url.join('?'); // join on GET params
- }
- $('#ajaxForm').ajaxSubmit(o);
-
+$('#ajaxForm').ajaxForm({
+ beforeSubmit: function(a,f,o) {
+ o.dataType = 'script';
+ },
+ success: function(data) {
+ }
});
\ No newline at end of file
diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index 18e8e375b..902f815d6 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -10,7 +10,7 @@ $('.bulletin_files_block a.delete').live('click', function(){
});
$(document).on('click', '.action a.remove_existing_record', function(){
- if(confirm("<%= I18n.t('announcement.sure?')%>")){
+ if(confirm("<%= I18n.t(:sure?)%>")){
$(this).next('.should_destroy').attr('value', 1);
$("tr#" + $(this).prev().attr('value')).hide();
}
diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js
index c23a73bfd..d2f183f06 100644
--- a/app/assets/javascripts/inc/ajax_setting.js
+++ b/app/assets/javascripts/inc/ajax_setting.js
@@ -1,7 +1,7 @@
-jQuery(document).ajaxStart(function(){
- $('').appendTo('body');
-});
+// jQuery(document).ajaxStart(function(){
+// $('').appendTo('body');
+// });
-jQuery(document).ajaxComplete(function(){
- $("#sys_modal").hide().remove();
-});
+// jQuery(document).ajaxComplete(function(){
+// $("#sys_modal").hide().remove();
+// });
diff --git a/app/assets/javascripts/inc/modal-preview.js b/app/assets/javascripts/inc/modal-preview.js
index 959f04b2c..87973b557 100644
--- a/app/assets/javascripts/inc/modal-preview.js
+++ b/app/assets/javascripts/inc/modal-preview.js
@@ -3,6 +3,58 @@
// <%= link_to "NewPreview", realtime_preview_admin_ad_banner_path(ad_banner_tab) , :class=>'preview_trigger'%>
$(document).ready(function() {
+ // $(".post_preview").click(function(e){
+ // $("#main-wrap").after("'+tile.title+' '+tile.title+' '+tile.title+' Loading...
'+tile.title+' Loading...
"
ret << (link_to node.title, dest, :class => 'js_history')
ret << "
"
- ret << (link_to t('admin.edit'), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
- ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
- ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
+ ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
+ ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
+ ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
ret << "
"
ret << "
'.html_safe
@@ -44,34 +49,55 @@ module AttributeFieldsHelper
end
def render_checkbox
- markup_value = eval(self.markup_value) rescue {}
+
+ @prefiled_value ||=[]
+ # begin
+ # markup_value = eval(self.markup_value)
+ # rescue
+ # markup_value = self.markup_value
+ # ensure
+ # markup_value ||= {}
+ # end
+
control_group_wrapper do
- markup_value.collect do |key,value|
- label_tag(key,check_box_tag(get_field_name_base+"[value][#{key}]", value[I18n.locale.to_s], (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
+ a = self[:option_list].collect do |key,value|
+ label_tag(key,check_box_tag(get_field_name_base+"[#{key}]", true , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
end.join rescue ""
end
end
def render_date
- control_group_wrapper{date_select(get_field_name_base+"[value]",nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
+ #NP
+ control_group_wrapper{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
end
def render_date_durnation #Need re-write low priority
-
+
end
def render_radio_button
- markup_value = eval(self.markup_value) rescue {}
- control_group_wrapper do
- markup_value.collect do |key,value|
- label_tag(key,radio_button_tag(get_field_name_base+"[value][#{key}]", value[I18n.locale.to_s], (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
- end.join rescue ""
+ @prefiled_value ||=[]
+ # begin
+ # markup_value = eval(self.markup_value)
+ # rescue
+ # markup_value = self.markup_value
+ # ensure
+ # markup_value ||= {}
+ # end
+ control_group_wrapper do
+ self[:option_list].collect do |key,value|
+ label_tag(key,radio_button_tag(get_field_name_base, key , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
+ end.join
end
end
def render_select
- markup_value = eval(self.markup_value) rescue {}
- control_group_wrapper{select_tag( get_field_name_base+"[value]",options_for_select(markup_value.collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
+
+ prompt = @panel_setting[:prompt][I18n.locale] rescue nil
+ @markup_options.merge!(:prompt => prompt) unless prompt.nil?
+ # markup_value = (self.markup_value.is_a?(Hash) ? self.markup_value : eval(self.markup_value) )rescue {}
+ # check self[:option_list].collect{|p| [p[1][I18n.locale.to_s],p[0]]}
+ control_group_wrapper{select_tag( get_field_name_base,options_for_select(self.option_list.collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
end
def render_text_area
@@ -79,27 +105,35 @@ module AttributeFieldsHelper
if(add_more and value.is_a?(Hash))
values = value
values.each_with_index.collect do |value,index|
- text_area_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options)
+ place_holder= @panel_setting["placeholder"][key]
+ text_area_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options.merge(:placeholder=>place_holder))
end.join.html_safe
else
value = can_muti_lang_input ? @prefiled_value[key] : @prefiled_value
- key = can_muti_lang_input ? "[#{key}]" : "[value]"
- text_area_tag(get_field_name_base + key, value,@markup_options)
+ key = can_muti_lang_input ? "[#{key}]" : ""
+ place_holder= @panel_setting["placeholder"][I18n.locale.to_s] rescue ''
+ text_area_tag(get_field_name_base + key, value,@markup_options.merge(:placeholder=>place_holder))
end
end
end
def render_text_field
control_group_wrapper do |key,value|
- if(add_more and value.is_a?(Hash))
+ if(add_more)
values = value
- values.each_with_index.collect do |value,index|
- text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options)
- end.join.html_safe
+ result = ""
+ unless values.nil?
+ result = values.each_with_index.collect do |value,index|
+ place_holder= @panel_setting["placeholder"][key]
+ text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options.merge(:placeholder=>place_holder))
+ end.join.html_safe
+ end
+ result
else
- value = can_muti_lang_input ? @prefiled_value[key] : @prefiled_value
- key = can_muti_lang_input ? "[#{key}]" : "[value]"
- text_field_tag(get_field_name_base + key, value,@markup_options)
+ value = (can_muti_lang_input ? @prefiled_value[key] : @prefiled_value) rescue nil
+ key_field = can_muti_lang_input ? "[#{key}]" : ""
+ place_holder= @panel_setting["placeholder"][key] rescue ''
+ text_field_tag(get_field_name_base + key_field, value,@markup_options.merge(:placeholder=>place_holder))
end
end
end
@@ -118,16 +152,18 @@ protected
if can_muti_lang_input
result << "
"
result << "
"
+
VALID_LOCALES.collect do |key|
value = @prefiled_value[key.to_s] rescue nil
div_class = ["tab-pane" ,"fade"].join(" ")
div_class << (key == I18n.locale.to_s ? " active in" : '')
result << content_tag(:div,yield(key,value),:class=>div_class,:id=>"tab"+id.to_s+"_#{key}")
end
+
result << "
"
result << "
"
VALID_LOCALES.each do |key|
- result << content_tag(:li,link_to(I18n.t("langs."+key),"#tab"+id.to_s+"_#{key}",:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil))
+ result << content_tag(:li,link_to(t(:_locale, :locale => key),"#tab"+id.to_s+"_#{key}",:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil))
end
result << " "
result << "
"
@@ -158,14 +194,13 @@ protected
def end_block
if @new_attribute
- hidden_field_tag(get_field_name_base+"[attribute_field_id]",id,:for=>"field_#{@index}")
+ hidden_field_tag(get_basic_field_name_base+"[attribute_field_id]",id,:for=>"field_#{@index}")
else
- hidden_field_tag(get_field_name_base+"[id]",@attribute_value.id,:for=>"field_#{@index}")
+ hidden_field_tag(get_basic_field_name_base+"[id]",@attribute_value.id,:for=>"field_#{@index}")
end
end
- def get_field_name_base
- # "user[#{self.attribute._type.downcase.pluralize}][#{self.attribute._id.to_s}][attribute_values][#{attribute_value.id}]"
+ def get_basic_field_name_base
if @new_attribute
"user[new_attribute_values][#{@index}]"
else
@@ -173,12 +208,16 @@ protected
end
end
+ def get_field_name_base
+ get_basic_field_name_base + "[value]"
+ end
+
def label
- label_tag(key,title,:class=>"control-label")
+ label_tag(key,title,:class=>"control-label",:func => "field_label")
end
def can_muti_lang_input
- locale and LIST[:markups][markup]["muti_lang_input_supprt"]
+ LIST[:markups][markup]["muti_lang_input_supprt"] #and locale
end
def can_add_more
diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index f73ce2ae1..c1894ac2f 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -45,7 +45,7 @@ module OrbitBackendHelper
end
def show_toggle_archive_btn(object)
- object.disable ? t("object_disable.change_to_false") : t("object_disable.change_to_true")
+ object.disable ? t(:disable) : t(:enable)
end
end
\ No newline at end of file
diff --git a/app/jobs/nccu_calendar.rb b/app/jobs/nccu_calendar.rb
index 8756029d1..df60bdd25 100644
--- a/app/jobs/nccu_calendar.rb
+++ b/app/jobs/nccu_calendar.rb
@@ -16,6 +16,6 @@ end
# FileUtils.mv(temp_file, File.join(Rails.root, 'public/static', 'nccu_calendar.xml'))
- puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced"
+ puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced #{File.join(Rails.root, 'public/static', 'nccu_calendar.xml')}"
end
end
diff --git a/app/models/app_manager.rb b/app/models/app_manager.rb
index 0d81a0ec2..d2fdc24dc 100644
--- a/app/models/app_manager.rb
+++ b/app/models/app_manager.rb
@@ -2,11 +2,11 @@ class AppManager
include Mongoid::Document
include Mongoid::Timestamps
- belongs_to :user
+ belongs_to :user,index: true
- belongs_to :managing_app, :polymorphic => true #,:class_name => 'ModuleApp',:inverse_of => :managers,:foreign_key => "user_id"
+ belongs_to :managing_app, :polymorphic => true,index: true #,:class_name => 'ModuleApp',:inverse_of => :managers,:foreign_key => "user_id"
belongs_to :sub_managing_app, :polymorphic => true #,:class_name => 'ModuleApp',:inverse_of => :sub_manager,:foreign_key => "sub_user_id"
belongs_to :rule_creator,:class_name => 'User'
-
+
end
\ No newline at end of file
diff --git a/app/models/design/css_default.rb b/app/models/design/css_default.rb
new file mode 100644
index 000000000..bd4baa8ca
--- /dev/null
+++ b/app/models/design/css_default.rb
@@ -0,0 +1,8 @@
+class CssDefault < Stylesheet
+
+ # belongs_to :design
+ # belongs_to :desktop_widget
+
+ belongs_to :css, polymorphic: true
+
+end
diff --git a/app/models/design/css_reset.rb b/app/models/design/css_reset.rb
new file mode 100644
index 000000000..b2a14b602
--- /dev/null
+++ b/app/models/design/css_reset.rb
@@ -0,0 +1,5 @@
+class CssReset < Stylesheet
+
+ belongs_to :design
+
+end
diff --git a/app/models/design/design.rb b/app/models/design/design.rb
index 58f95bd48..54870a896 100644
--- a/app/models/design/design.rb
+++ b/app/models/design/design.rb
@@ -3,25 +3,27 @@ class Design
include Mongoid::Timestamps
include ParserLayout
- field :title, :type => String
field :author, :type => String
field :intro, :type => String
+ field :title, :type => String
field :version, :type => String
+ has_one :css_default, as: :css, :autosave => true, :dependent => :destroy
+ has_one :layout, :autosave => true, :dependent => :destroy
+ has_one :css_reset, :autosave => true, :dependent => :destroy
+ has_many :images,as: :imgs, :autosave => true, :dependent => :destroy
+ has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy
has_many :pages
-
- embeds_one :layout, :cascade_callbacks => true
- embeds_one :default_css, :class_name => "Stylesheet", :cascade_callbacks => true
- embeds_one :reset_css, :class_name => "Stylesheet", :cascade_callbacks => true
- embeds_many :themes, :cascade_callbacks => true
- embeds_many :javascripts, :cascade_callbacks => true
- embeds_many :images, :as => :design_image, :cascade_callbacks => true
- # embeds_many :custom_images, :class_name => 'Image', :cascade_callbacks => true
-
- validates_presence_of :title
- validates_presence_of :author
+ has_many :themes, :autosave => true, :dependent => :destroy
+
+ accepts_nested_attributes_for :images, :allow_destroy => true
+ accepts_nested_attributes_for :javascripts, :allow_destroy => true
+ accepts_nested_attributes_for :themes, :allow_destroy => true
+
+ validates_presence_of :author, :title
after_save :parse_css_for_images
+
def new_files=(*attrs)
attrs[0].map do |key,items_ary| #Loop by JSs,Themes,Imgs
@@ -66,13 +68,9 @@ class Design
protected
def parse_css_for_images
- if (self.default_css && self.default_css.changed)
- self.default_css.parse_urls
- end
+ self.css_default.parse_urls
self.themes.each do |theme|
- if theme.changed?
- theme.parse_urls
- end
+ theme.parse_urls
end
parse_body_for_images(self)
end
diff --git a/app/models/design/design_file.rb b/app/models/design/design_file.rb
index 3aec9a0cb..973313c40 100644
--- a/app/models/design/design_file.rb
+++ b/app/models/design/design_file.rb
@@ -4,7 +4,14 @@ class DesignFile
mount_uploader :file, AssetUploader
- field :to_save, :type => Boolean
- field :to_destroy, :type => Boolean
+ field :name
+
+ before_save :set_name
+
+ protected
+
+ def set_name
+ self.name = self.file_identifier
+ end
end
diff --git a/app/models/design/image.rb b/app/models/design/image.rb
index 939095e8e..d1a57d7fb 100644
--- a/app/models/design/image.rb
+++ b/app/models/design/image.rb
@@ -1,11 +1,26 @@
-class Image < DesignFile
+class Image
+ include Mongoid::Document
+ include Mongoid::Timestamps
- field :in_css, :type => Boolean
- field :name
field :html_id
field :html_class
-
- embedded_in :design_image, polymorphic: true
+ field :in_css, :type => Boolean, :default => false
+ field :in_html, :type => Boolean, :default => false
+ field :name
mount_uploader :file, ImageUploader
-end
+
+ # belongs_to :design
+ # belongs_to :desktop_widget
+
+ belongs_to :imgs, polymorphic: true
+
+ before_save :set_name
+
+ protected
+
+ def set_name
+ self.name = self.file_identifier
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/design/javascript.rb b/app/models/design/javascript.rb
index 7bfd2c5a7..808679d77 100644
--- a/app/models/design/javascript.rb
+++ b/app/models/design/javascript.rb
@@ -1,3 +1,6 @@
class Javascript < DesignFile
- embedded_in :design
+ # belongs_to :design
+ # belongs_to :desktop_widget
+
+ belongs_to :js, polymorphic: true
end
diff --git a/app/models/design/layout.rb b/app/models/design/layout.rb
index bf48415cb..a782894df 100644
--- a/app/models/design/layout.rb
+++ b/app/models/design/layout.rb
@@ -6,7 +6,7 @@ class Layout < DesignFile
field :body
embeds_one :menu
- embedded_in :design
+ belongs_to :design
embeds_many :layout_parts
before_save :parse_layout
diff --git a/app/models/design/stylesheet.rb b/app/models/design/stylesheet.rb
index bb2ec85e4..5e9a57750 100644
--- a/app/models/design/stylesheet.rb
+++ b/app/models/design/stylesheet.rb
@@ -1,34 +1,40 @@
-class Stylesheet < DesignFile
- embedded_in :design
- mount_uploader :file_orig, AssetUploader
-
- def parse_urls
- orig_content = content = self.file.read.force_encoding("UTF-8")
- # self.remove_file!
- # self.remove_file_orig!
- names = []
- images = self.design.images
- content.scan(/(?<=url)(.*?)(?=\))/){
- css_name = $1.gsub(' ','').gsub('(','')
- name = File.basename(css_name).gsub(/[\\\"]/, '')
- file_name = images.detect{ |i| i.file_identifier.eql?(name) }.file_url rescue nil
- names << [css_name, file_name]
- }
- names.each do |name|
- content.gsub!(name[0], name[1]) if name[1]
- end
- Dir.mktmpdir('f_path') { |dir|
- orig_file_name = self.file_identifier
-
- temp_file = File.new(dir + '/' + orig_file_name, 'w+')
- temp_file.write orig_content.force_encoding("UTF-8")
- self.file_orig = temp_file
-
- temp_file = File.new(dir + '/' + orig_file_name, 'w+')
- temp_file.write content.force_encoding("UTF-8")
- self.file = temp_file
- self.save
- }
- end
-
-end
+class Stylesheet < DesignFile
+ # belongs_to :design
+ mount_uploader :file_orig, AssetUploader
+
+ def parse_urls
+ orig_content = content = self.file.read.force_encoding("UTF-8")
+ # self.remove_file!
+ # self.remove_file_orig!
+ names = {}
+ images = self.css.images
+ content.scan(/(?<=url)(.*?)(?=\))/){
+ css_name = $1.gsub(' ','').gsub('(','')
+ unless names.has_key?(css_name)
+ name = File.basename(css_name).gsub(/[\\\"]/, '')
+ image = images.detect{ |i| i.file_identifier.eql?(name) } rescue nil
+ if image
+ image.update_attribute(:in_css, true)
+ file_name = image.file_url
+ names.merge!({css_name => file_name})
+ end
+ end
+ }
+ names.each_pair do |key, value|
+ content.gsub!(key, value)
+ end
+ Dir.mktmpdir('f_path') { |dir|
+ orig_file_name = self.file_identifier
+
+ temp_file = File.new(dir + '/' + orig_file_name, 'w+')
+ temp_file.write orig_content.force_encoding("UTF-8")
+ self.file_orig = temp_file
+
+ temp_file = File.new(dir + '/' + orig_file_name, 'w+')
+ temp_file.write content.force_encoding("UTF-8")
+ self.file = temp_file
+ self.save
+ }
+ end
+
+end
diff --git a/app/models/design/theme.rb b/app/models/design/theme.rb
index 8aca324b5..0935fe12f 100644
--- a/app/models/design/theme.rb
+++ b/app/models/design/theme.rb
@@ -1,14 +1,11 @@
class Theme < Stylesheet
- field :name
- embedded_in :design
-
- before_save :set_name
+ belongs_to :design
protected
def set_name
- self.name = File.basename(self.file_identifier,".css")
+ self.name = File.basename(self.file_identifier, ".css")
end
end
diff --git a/app/models/desktop.rb b/app/models/desktop/desktop.rb
similarity index 70%
rename from app/models/desktop.rb
rename to app/models/desktop/desktop.rb
index e8c1e9c44..6633005f4 100644
--- a/app/models/desktop.rb
+++ b/app/models/desktop/desktop.rb
@@ -2,14 +2,15 @@ class Desktop
include Mongoid::Document
include Mongoid::Timestamps
- field :theme, default: "4f8d3f493b67fcd05f086359"
+ field :theme, default: "4f8d3f533b67fcd05f08635a"
field :customtheme
field :wallpaper
belongs_to :user
+ has_and_belongs_to_many :desktop_widgets, :autosave => true
has_many :sections, :autosave => true, :dependent => :destroy
- has_many :desktop_widgets, :autosave => true, :dependent => :destroy
+ # has_many :desktop_widgets, :autosave => true, :dependent => :destroy
before_create :initialize_section
diff --git a/app/models/desktop_theme.rb b/app/models/desktop/desktop_theme.rb
similarity index 100%
rename from app/models/desktop_theme.rb
rename to app/models/desktop/desktop_theme.rb
diff --git a/app/models/desktop/desktop_widget.rb b/app/models/desktop/desktop_widget.rb
new file mode 100644
index 000000000..feb40aa7b
--- /dev/null
+++ b/app/models/desktop/desktop_widget.rb
@@ -0,0 +1,33 @@
+class DesktopWidget
+ include Mongoid::Document
+ include Mongoid::Timestamps
+ include ParserLayoutWidget
+
+ field :name
+ field :author
+ field :shape
+ field :version, :type => String
+
+ has_one :css_default, as: :css, :autosave => true, :dependent => :destroy
+ has_one :widget_layout, :autosave => true, :dependent => :destroy
+ has_many :images, as: :imgs, :autosave => true, :dependent => :destroy
+ has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy
+ has_and_belongs_to_many :desktops, :autosave => true
+ belongs_to :tiles, :autosave => true
+
+ accepts_nested_attributes_for :images, :allow_destroy => true
+ accepts_nested_attributes_for :javascripts, :allow_destroy => true
+
+ after_save :parse_css_for_images
+
+ # belongs_to :desktop
+
+
+ protected
+
+ def parse_css_for_images
+ self.css_default.parse_urls
+ parse_widget_for_images(self)
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/desktop/group.rb b/app/models/desktop/group.rb
new file mode 100644
index 000000000..2c1992f00
--- /dev/null
+++ b/app/models/desktop/group.rb
@@ -0,0 +1,18 @@
+class Group
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ belongs_to :section
+ has_many :tiles, :autosave => true, :dependent => :destroy
+ before_create :initialize_tile
+
+ def initialize_tile
+ self.tiles.build(data_category: "app", data_content: "quotes", position: 5, shape: "w1 h1", title: "Quotes")
+ self.tiles.build(data_category: "app", data_content: "dailyenglish", position: 6, shape: "w1 h1", title: "Daily English Word")
+ widgets = self.section.desktop.desktop_widgets.collect{|widget| widget.id}
+ for i in 0..3
+ self.tiles.build(data_category: "widget", position: i+1,desktop_widget_id: widgets[i])
+ end
+ end
+end
+
\ No newline at end of file
diff --git a/app/models/other_account.rb b/app/models/desktop/other_account.rb
similarity index 100%
rename from app/models/other_account.rb
rename to app/models/desktop/other_account.rb
diff --git a/app/models/section.rb b/app/models/desktop/section.rb
similarity index 100%
rename from app/models/section.rb
rename to app/models/desktop/section.rb
diff --git a/app/models/tile.rb b/app/models/desktop/tile.rb
similarity index 86%
rename from app/models/tile.rb
rename to app/models/desktop/tile.rb
index 70066d1be..91840d8a4 100644
--- a/app/models/tile.rb
+++ b/app/models/desktop/tile.rb
@@ -9,6 +9,6 @@ class Tile
field :title
belongs_to :group
-
-
+ has_one :desktop_widget
+
end
diff --git a/app/models/desktop/widget_layout.rb b/app/models/desktop/widget_layout.rb
new file mode 100644
index 000000000..5bf24805f
--- /dev/null
+++ b/app/models/desktop/widget_layout.rb
@@ -0,0 +1,18 @@
+class WidgetLayout < DesignFile
+
+ attr_reader :content
+
+ field :body
+
+ belongs_to :desktop_widget
+
+
+ def content
+ self.file.read.force_encoding("UTF-8") rescue ''
+ end
+
+ def self.exist_one?
+ WidgetLayout.count > 0
+ end
+
+end
diff --git a/app/models/desktop_widget.rb b/app/models/desktop_widget.rb
deleted file mode 100644
index eb0446ded..000000000
--- a/app/models/desktop_widget.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class DesktopWidget
- include Mongoid::Document
- include Mongoid::Timestamps
-
- field :name
- field :author
- field :shape
- field :desktop_id
- field :status
- field :section
-
- belongs_to :desktop
-end
\ No newline at end of file
diff --git a/app/models/group.rb b/app/models/group.rb
deleted file mode 100644
index 7346ad1ec..000000000
--- a/app/models/group.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Group
- include Mongoid::Document
- include Mongoid::Timestamps
-
- belongs_to :section
- has_many :tiles, :autosave => true, :dependent => :destroy
- before_create :initialize_tile
-
- def initialize_tile
- self.tiles.build(data_category: "widget", data_content: "timetable", position: 1, shape: "w2 h2", title: "Tiime Table")
- self.tiles.build(data_category: "app", data_content: "quotes", position: 2, shape: "w1 h1", title: "Quotes")
- self.tiles.build(data_category: "widget", data_content: "weather", position: 3, shape: "w2 h2", title: "Weather")
- self.tiles.build(data_category: "widget", data_content: "clock", position: 4, shape: "w2 h1", title: "Clock")
- self.tiles.build(data_category: "app", data_content: "dailyenglish", position: 5, shape: "w1 h1", title: "Daily English Word")
- self.tiles.build(data_category: "widget", data_content: "school_events", position: 6, shape: "w2 h1", title: "School Events")
- end
-
-end
-
\ No newline at end of file
diff --git a/app/models/module_app.rb b/app/models/module_app.rb
index 88a5ce83e..669d82aab 100644
--- a/app/models/module_app.rb
+++ b/app/models/module_app.rb
@@ -48,7 +48,7 @@ class ModuleApp
def assign_manager(user,assigner)
manager = AppManager.first(conditions: {managing_app_id: self.id,user_id: user.id}) rescue nil
if manager.nil?
- manager = self.managers.create(:user => user,:rule_creator => assigner)
+ manager = self.managers.create(:user_id => user.id,:rule_creator_id => (assigner.id rescue nil))
end
manager
end
@@ -56,7 +56,7 @@ class ModuleApp
def assign_sub_manager(user,assigner)
submanager = AppManager.first(conditions: {sub_managing_app_id: self.id,user_id: user.id}) rescue nil
if submanager.nil? && !self.managing_users.include?(user)
- submanager = self.sub_managers.create(:user => user,:rule_creator => assigner)
+ submanager = self.sub_managers.create(:user_id => user.id,:rule_creator_id => (assigner.id rescue nil) )
end
submanager
end
@@ -82,7 +82,7 @@ class ModuleApp
protected
def set_key
- self.key = self.title.underscore if self.title
+ self.key = self.title.underscore.singularize if self.title
end
diff --git a/app/models/object_auth.rb b/app/models/object_auth.rb
index d5cc48de5..6c7405ca4 100644
--- a/app/models/object_auth.rb
+++ b/app/models/object_auth.rb
@@ -2,23 +2,28 @@ class ObjectAuth < PrototypeAuth
include OrbitCoreLib::ObjectTokenUnility
validates_uniqueness_of :title ,:scope => [:obj_authable_type,:obj_authable_id] #{ |c| }
belongs_to :obj_authable, polymorphic: true
- after_save :check_user_has_app_auth
+ after_save :check_user_has_can_access_app
# > - Something.find_with_auth(query)
# > - or Something.find(query).auth
+ def siblings
+ ObjectAuth.where({obj_authable_type: obj_authable_type,title: title})
+ end
+
def auth_obj
class_obj = eval(self.obj_authable_type)
class_obj.find self.obj_authable_id
end
- def check_user_has_app_auth
- sub_managing_users = auth_obj.app_auth.sub_managing_users rescue []
- app_auth = auth_obj.app_auth
+ def check_user_has_can_access_app
+ sub_managing_users = auth_obj.module_app.sub_managing_users rescue []
+ module_app = auth_obj.module_app
self.auth_users.each do |auth_user|
if !sub_managing_users.include? auth_user && !auth_user.admin?
- app_auth.assign_sub_manager(auth_user,User.current)
- app_auth.save!
+ module_app.assign_sub_manager(auth_user,User.current)
+ module_app.save
end
end
+
end
end
\ No newline at end of file
diff --git a/app/models/preview.rb b/app/models/preview.rb
new file mode 100644
index 000000000..9c55fc796
--- /dev/null
+++ b/app/models/preview.rb
@@ -0,0 +1,110 @@
+class Preview
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ # field :object_f, :type => Hash
+ field :object, :type=> Hash
+ field :preview_at_link
+ field :expired_at , :type => DateTime
+ field :link_args, :type => Array
+ field :object_class_type
+
+ has_many :preview_files, :autosave => true, :dependent => :destroy
+ has_many :preview_associations, :autosave => true, :dependent => :destroy
+ # def object=(params)
+ # save_upload_temp_link(params,"news_bulletin_files_attributes") #unless params[]
+ # self.object_f = params
+ # end
+
+ # def object
+ # return object_f
+ # end
+
+ # def save_upload_temp_link(params,field_name = "bulletin_files_attributes")
+ # image = preview_files.build(:file=>params[:image])
+ # params[:image] = image.id
+
+ # params[field_name].each_with_index do |item,index|
+ # bfa = preview_files.build(:file=>params[field_name][index.to_s][:file])
+ # params[field_name][index.to_s] = bfa.id
+ # end unless params[field_name].nil?
+ # end
+
+ # def dig_in_hash(hash,paths_ary)
+ # hash.each_pair do |key,in_hash|
+ # if in_hash.kind_of? Array
+ # dig_in_array(hash,paths_ary)
+ # elsif in_hash.kind_of? Hash
+ # dig_in_hash(hash,paths_ary)
+ # else
+ # puts("\n End Node: \t #{paths_ary.join } #{in_hash.class} : #{key}##{in_hash}")
+ # end
+ # end
+ # end
+
+ # def dig_in_array(array,paths_ary)
+ # array.each do |item|
+ # if item.kind_of? Array
+ # dig_in_array(hash,paths_ary)
+ # elsif item.kind_of? Hash
+ # dig_in_hash(hash,paths_ary)
+ # else
+ # puts("\n End Node: \t #{paths_ary.join } #{item.class} : {item}")
+ # end
+ # end
+ # end
+
+
+ # def dig_in_hash_old(hash,paths_ary)
+ # hash.each_pair do |k,in_hash|
+ # if (!in_hash.kind_of? Array and !in_hash.kind_of? Hash)
+ # #p "UploadedFile : #{in_hash.is_a? ActionDispatch::Http::UploadedFile}"
+ # #in_hash = "no file" if in_hash.is_a? ActionDispatch::Http::UploadedFile
+ # #in_hash.select{|key,hash| hash.is_a? ActionDispatch::Http::UploadedFile}
+ # puts("\n End Node:# \n")
+ # p "#{paths_ary.join } #{in_hash.class} : #{in_hash}"
+ # #p "UploadedFile(#{in_hash}) : #{in_hash.is_a? ActionDispatch::Http::UploadedFile}"
+ # else
+ # if (!in_hash.first.kind_of? Array and !in_hash.first.kind_of? Hash)
+ # paths_ary << "[#{in_hash.first}]"
+ # end
+ # puts("\n Go Down [#{in_hash.first}]\n")
+ # dig_in_hash(in_hash,paths_ary)
+ # puts("\n Go Out \n")
+ # end
+ # puts "This is last"
+ # paths_ary.pop
+ # end
+ # end
+
+ def get_arg_hash
+ object.slice(*link_args).inject({}){|la,(k,v)| la[k.to_sym] = v; la}
+ end
+
+ def get_preview_link
+ ap = Rails.application.routes.url_helpers
+ ap.send preview_at_link,({:id=>id,:preview=>true}.merge get_arg_hash)
+ #func = eval("Rails.application.routes.url_helpers.#{preview_at_link}").send
+ end
+
+ def get_virtual_object
+ virtual_object = eval(self.object_class_type).new object
+ preview_files.each do |file|
+ if file.file_in_array
+ eval("virtual_object.#{file.field_name_for_rebuild}.build :file=>file.file")
+ else
+ eval("virtual_object.#{file.field_name_for_rebuild} = file.file")
+ end
+ end
+
+ preview_associations.each do |local_object|
+ if local_object.object_in_array
+ eval("virtual_object.#{local_object.field_name_for_rebuild}.build local_object.object")
+ else
+ eval("virtual_object.#{local_object.field_name_for_rebuild} = local_object.object")
+ end
+ end
+ virtual_object
+ end
+
+end
diff --git a/app/models/preview_association.rb b/app/models/preview_association.rb
new file mode 100644
index 000000000..64785b9af
--- /dev/null
+++ b/app/models/preview_association.rb
@@ -0,0 +1,16 @@
+class PreviewAssociation
+
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ field :object, :type=> Hash
+ field :field_name_for_rebuild
+ field :object_in_array , :type => Boolean,default: false
+
+ # field :to_save, :type => Boolean
+ field :should_destroy, :type => Boolean
+
+ belongs_to :preview
+ # embedded_in :news_bulletin
+
+end
diff --git a/app/models/preview_file.rb b/app/models/preview_file.rb
new file mode 100644
index 000000000..d06ddc257
--- /dev/null
+++ b/app/models/preview_file.rb
@@ -0,0 +1,19 @@
+class PreviewFile
+
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ mount_uploader :file, AssetUploader
+
+ field :title, localize: true
+ field :description, localize: true
+ field :field_name_for_rebuild
+ field :file_in_array , :type => Boolean,default: false
+
+ # field :to_save, :type => Boolean
+ field :should_destroy, :type => Boolean
+
+ belongs_to :preview
+ # embedded_in :news_bulletin
+
+end
diff --git a/app/models/user/attribute.rb b/app/models/user/attribute.rb
index faa5876a0..c0970863f 100644
--- a/app/models/user/attribute.rb
+++ b/app/models/user/attribute.rb
@@ -11,6 +11,7 @@ class Attribute
has_many :attribute_fields, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :attribute_fields, :allow_destroy => true
+
def is_built_in?
self.built_in
end
diff --git a/app/models/user/attribute_field.rb b/app/models/user/attribute_field.rb
index 4407cb6dd..a94a38a28 100644
--- a/app/models/user/attribute_field.rb
+++ b/app/models/user/attribute_field.rb
@@ -5,26 +5,68 @@ class AttributeField
include ::AttributeFieldsHelper
field :key
- field :markup
- field :markup_value ,:type => Hash
+ field :markup ,:default=>"text_field"
+ field :option_list ,:type => Hash,:default => {}
field :markup_options,:type => Hash
- field :locale, :type => Boolean, :default => true
+ # field :locale, :type => Boolean, :default => true
# field :list_options, :type => Array
field :built_in, :type => Boolean, :default => false
field :disabled, :type => Boolean, :default => false
- field :add_more,:type => Boolean, :default => false
+ field :to_delete,:type=> Boolean,:default => false
+ field :typeA,:type=> Hash,:default=>{}
+ field :typeB,:type=> Hash,:default=>{}
+ field :typeC,:type=> Hash,:default=>{:claendar=>"west_claendar"}
+ field :typeD,:type=> Hash,:default=>{}
+ field :typeE,:type=> Hash,:default=>{}
+
#field :title, localize: true
- field :locale_title, localize: true
- field :neutral_title
- field :neutral_for
+ field :title, localize: true
+
belongs_to :attribute
# belongs_to :role
- has_many :attribute_values
-
+ has_many :attribute_values,:autosave => true, :dependent => :destroy
+ before_save :check_option_list
# validates_uniqueness_of :key
+ def add_more
+ (get_data["add_more"] == "true" ? true : false) rescue false
+ end
+
+ def locale
+ default = true
+ if get_data["locale"].nil?
+ return default
+ else
+ (get_data["locale"] == "true" ? true : false) rescue default
+ end
+ end
+
+ def self_defined_markup_options?
+ (self.attribute.role.method(self[:key].pluralize.to_sym) && self.attribute.role.method(self[:key].pluralize+"_for_"+markup)) rescue false
+ end
+
+ def markup_value=(var)
+ if !self_defined_markup_options?
+ self[:markup_value] = (eval(var) rescue {})
+ end
+ end
+
+ def option_list
+ if self_defined_markup_options?
+ #Class need to have corresponding field and value agent
+ # Ex: For "status" the class must have field called "statuses" for the relation and "statuses_for_select" for the select function
+ method = self.attribute.role.method(self[:key].pluralize+"_for_"+markup)
+ return (method.call rescue {})
+ elsif self[:option_list].nil? || (self[:option_list].empty?)
+ return {}
+ else
+ return self[:option_list]
+ end
+ end
+
+
def markup_options=(var)
self[:markup_options] = (eval(var) rescue {})
@@ -43,36 +85,49 @@ class AttributeField
self.attribute.role
end
- def title_translations
- if locale
- return locale_title_translations
- else
- return Hash[VALID_LOCALES.map{|d| [d,neutral_title]}]
- end
+ def panel
+ panel = LIST[:markups][self[:markup]]["panel"]
end
- def title_translations=(var)
- if locale
- self.locale_title_translations = var
- end
+ def get_data
+ self[panel]
end
- def title
- if locale
- return self.locale_title
- else
- return self.neutral_title
- end
- end
- def title=(var)
- # binding.pry
- if locale
- self.locale_title = var
- else
- self.neutral_title = var
- end
- end
+ # def title_translations
+ # if locale
+ # return self.locale_title_translations
+ # else
+ # return self[:neutral_title] #Hash[VALID_LOCALES.map{|d| [d,neutral_title]}]
+ # end
+ # end
+
+ # def title_translations=(var)
+ # if locale
+ # self.locale_title_translations = var
+ # end
+ # end
+
+ # def title
+ # if locale
+ # return self.locale_title
+ # else
+ # return self.neutral_title
+ # end
+ # end
+
+ # def check_title
+ # if locale
+ # self.locale_title_translations = self[:temp_title]
+ # else
+ # self.neutral_title = self[:temp_title]
+ # end
+ # self.unset("temp_title")
+ # end
+
+ # def title=(var)
+ # self["temp_title"] = var
+ # end
# # Convert the string list_options into an array
# def select_list_options=(var)
@@ -92,4 +147,9 @@ class AttributeField
self.disabled
end
+protected
+ def check_option_list
+ self[:option_list] = self[panel]["option_list"]
+ end
+
end
diff --git a/app/models/user/attribute_value.rb b/app/models/user/attribute_value.rb
index 2835a0bda..d6500fbf1 100644
--- a/app/models/user/attribute_value.rb
+++ b/app/models/user/attribute_value.rb
@@ -10,9 +10,55 @@ class AttributeValue
belongs_to :user
before_save :check_key
-
+ before_save :data_proc
# NO_MULTI_TAG = ["select","date","radio_button","checkbox","date_durnation"]
+
+ def data_proc
+ # binding.pry
+ # binding.pry if self.attribute_field.markup == 'radio_button'
+ # if self.attribute_field
+ case self.attribute_field.markup
+ when 'text_field','text_area'
+ # binding.pry
+ self[:temp_data].each{|key,val|
+ self[key] = val
+ } unless self[:temp_data].nil?
+ when 'select','date','radio_button'
+ self["val"] = self[:temp_data]
+ when 'checkbox'
+ self["val"] = self[:temp_data].keys rescue {}
+ end #end of case
+ else # if not locale
+ case self.attribute_field.markup
+ when 'text_field','text_area'
+ self["val"] = self[:temp_data]
+ when 'select','date','radio_button'
+ self["val"] = self[:temp_data]
+ when 'checkbox'
+ self["val"] = self[:temp_data].keys rescue {}
+ end #end of case
+ # end #of if self.attribute_field
+ self.unset('temp_data')
+ end
+
+ def value
+
+ result=""
+ if self.attribute_field.locale && (self.attribute_field.markup == "text_field" || self.attribute_field.markup == "text_area")
+ result= Hash[VALID_LOCALES.collect{|lang| [lang,self[lang.to_sym]]}]
+ else
+ result = self["val"]
+ end
+ result
+ end
+
+ def value=(value)
+ #save everything to temp_data waiting for futher process
+ # binding
+ self[:temp_data] = value
+ end
+
def check_key
self.key = attribute_field.key
end
@@ -26,45 +72,46 @@ class AttributeValue
end
def get_value_by_locale(locale)
+
case self.attribute_field.markup
when "text_field"
- self.attribute_field.locale ? self[locale] : self[:value]
+ self.attribute_field.locale ? self[locale.to_s] : self.value
when "select"
- markup_values = eval(self.attribute_field.markup_value)
- markup_values[self[:value]][locale.to_s] rescue 'NoData'
+ markup_values = self.attribute_field.self_defined_markup_options? ? self.attribute_field.markup_value : eval(self.attribute_field.markup_value)
+ markup_values[self.value][locale.to_s] rescue 'NoData'
when "text_area"
- self.attribute_field.locale ? self[locale] : self[:value]
+ self.attribute_field.locale ? self[locale.to_s] : self.value
when "date"
- Date.new(self[:value]["(1i)"].to_i,self[:value]["(2i)"].to_i,self[:value]["(3i)"].to_i) rescue nil
+ Date.new(self[:val]["(1i)"].to_i,self[:val]["(2i)"].to_i,self[:val]["(3i)"].to_i) rescue nil
when "addr"
- self[:value]
+ self.value
when "radio_button"
markup_values = eval(self.attribute_field.markup_value)
- markup_values[self[:value].first[0]][locale.to_s]
- when "checkbox"
- markup_values = eval(self.attribute_field.markup_value)
- self[:value].keys.collect{|key| markup_values[key][locale.to_s] }.join(",")
+ markup_values[:value][locale.to_s]
+ when "checkbox"
+ markup_values = self.attribute_field.markup_value
+ self[:value].keys.collect{|key| markup_values[key][locale.to_s]}.join(",")
when "date_durnation"
- self[:value]
+ self.value
else
- self.attribute_field.locale ? self[locale] : self[:value]
+ self.attribute_field.locale ? self[locale.to_s] : self.value
end
end
- def get_values
- unless ['select','checkbox','radio_button'].include?(self.attribute_field.markup )
- if self.attribute_field.locale && LIST[:markups][self.attribute_field.markup]["muti_lang_input_supprt"]
- return Hash[VALID_LOCALES.collect{|lang| [lang,get_value_by_locale(lang.to_sym)]}]
- else
- return get_value_by_locale("")
- end
- else
- if self.attribute_field.markup == "select"
- self[:value]
- else
- self[:value].keys
- end
- end
- end
+ # def get_values
+ # unless ['select','checkbox','radio_button'].include?(self.attribute_field.markup )
+ # if self.attribute_field.locale && LIST[:markups][self.attribute_field.markup]["muti_lang_input_supprt"]
+ # return Hash[VALID_LOCALES.collect{|lang| [lang,get_value_by_locale(lang.to_sym)]}]
+ # else
+ # return get_value_by_locale("")
+ # end
+ # else
+ # if self.attribute_field.markup == "select"
+ # self[:value]
+ # else
+ # self[:value].keys rescue self[:value]
+ # end
+ # end
+ # end
end
diff --git a/app/models/user/role.rb b/app/models/user/role.rb
index 438e2dabf..cd3d67758 100644
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@@ -27,4 +27,11 @@ class Role
self.first(:conditions => {:key => key})
end
+ def statuses_for_select
+ data = self.statuses.map do |t|
+ [t.id.to_s,t.title_translations]
+ end
+ Hash[data]
+ end
+
end
\ No newline at end of file
diff --git a/app/models/user/status.rb b/app/models/user/status.rb
index f9f194208..d9715d893 100644
--- a/app/models/user/status.rb
+++ b/app/models/user/status.rb
@@ -5,7 +5,7 @@ class Status
has_and_belongs_to_many :users
-
+ field :key
belongs_to :role
# has_and_belongs_to_many :sub_roles
diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 14ebbc690..4f645f3bf 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -9,10 +9,7 @@ class User
field :admin, :type => Boolean, :default => true
field :active_role
- field :nccu_ldap_uid
field :email
- # field :cache_dept
- # has_one :cache_dept, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
field :cache_dept,type: Hash
field :status_record,type: Hash
@@ -34,27 +31,61 @@ class User
accepts_nested_attributes_for :attribute_values, :allow_destroy => true
before_create :initialize_desktop
- before_save :check_status_record
+ before_save :rebuild_status_record
before_save :save_roles
-
scope :remote_account, where(:nccu_id.ne => nil)
- validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
-
+ # validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
+
# def new_attribute_values=(vars)
# binding.pry
# end
# def new_attribute_values(vars)
# binding.pry
# end
- def rebuild_sub_roles_from_attribute_values!(attribute_values)
- # attribute_fields = AttributeField.find attribute_values.collect{|t| t[1][:attribute_field_id]}
- # self.sub_roles = attribute_fields.collect{|t| t.attribute if t.attribute.is_a? SubRole}.compact.uniq
+
+ ## # class << self
+ ## def initialize
+ ## self.define_method("asd"){ p "hi"}
+ ## sub_roles.each do |sr|
+ ## sr_ids = sr.attribute_fields.collect{|t| t.id.to_s}
+ ## self.define_method("attribute_values_for_"+sr.key.to_s) {
+ ## AttributeValue.where(user_id: id ).in(attribute_field_id: sr_ids)
+ ## }
+ ## end
+ ## yield self
+ ## end
+
+ # end
+
+ # def initialize
+ # binding.pry
+ # # yield self
+ # end
+
+ def get_attribute_value(attribute_field)
+ attribute_values.where(attribute_field_id: attribute_field.id).first
end
+ def get_sub_roles_by_role(role)
+ sub_roles.where(role_id: role.id)
+ end
+
+ def disable_sub_role=(var)
+ var[:id].each do |id,val|
+ # binding.pry if id == '5052c5b22b5c49ab02000004'
+ if (val=="true")
+ self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
+ elsif(val=="false")
+ self.sub_roles << SubRole.find(id)
+ end
+ end
+ end
+
+
+
def set_sub_role(sub_role_id,status_id)
- self.sub_roles << SubRole.find(sub_role_id)
- self.status_record.store(sub_role_id,status_id)
+ self.status_record.merge!(Hash[sub_role_id,status_id])
end
# def get_status(*params)
@@ -80,11 +111,18 @@ class User
def self.find_by_status_and_sub_role_key(sub_role_key,status_key) #Query for users by using specific sub_role and status key
sr = ::SubRole.first({conditions: { key: sub_role_key }})
status = ::Status.first({conditions:{role_id: sr.role.id,key: status_key}})
- find_by_status(sr.id,status.id)
+ find_by_subrole_and_status(sr.id,status.id)
end
- def self.find_by_status(sub_role_id,status_id) #Query for users by using specific sub_role and status key buy within ID
- User.where("status_record.#{sub_role_id}" => status_id)
+ def self.find_by_subrole_and_status(sub_role_id,status_id) #Query for users by using specific sub_role and status key by within ID
+ User.where("status_record.#{sub_role_id}" => status_id,:sub_role_ids.in => [ sub_role_id ])
+ end
+
+ def self.find_by_status(status_id)
+ status = ::Status.find status_id
+ ::SubRole.where({role_id: status.role.id.to_s,disabled: false}).collect{|sr|
+ find_by_subrole_and_status(sr.id.to_s,status_id)
+ }.uniq!
end
def create_dept_cache
@@ -139,27 +177,21 @@ class User
end
def initialize_desktop
- self.build_desktop
+ self.build_desktop(desktop_widget_ids: DesktopWidget.all.collect{|widget| widget.id})
end
protected
- def save_roles
- self.roles = self.sub_roles.collect{|t| t.role}.uniq
+ def save_roles
+ self.roles = self.sub_roles.collect{|t| t.role}.uniq
+ end
+
+
+ def rebuild_status_record
+ self.status_record = {}
+ self.attribute_values.reject{|t| t.key!='status'}.each do |status|
+ # binding.pry
+ set_sub_role(status.attribute_field.attribute.id.to_s,status[:value]) rescue nil
+ end
end
- def check_status_record
- roles = sub_roles.collect{|t| t.role}.uniq #get all role from sub_roles
- sub_roles_ary = sub_roles.collect{|t| t.id.to_s}
- self.status_record = status_record.keep_if{|sub_role_id, status_id|
- includeing = sub_roles_ary.include?(sub_role_id)
- valide = false
- if includeing
- sub_role = SubRole.find sub_role_id
- valide = sub_role.role.statuses.include? (Status.find status_id)
- end
-
- (includeing and valide)
- } rescue {}
- end
-
-end
+end
\ No newline at end of file
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 41480fd53..748bac16d 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -24,7 +24,7 @@ class ImageUploader < CarrierWave::Uploader::Base
# Override the directory where uploaded files will be stored.
# This is a sensible default for uploaders that are meant to be mounted:
def store_dir
- "image/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+ "#{model.id}"
end
# Provide a default URL as a default if there hasn't been a file uploaded:
@@ -48,7 +48,7 @@ class ImageUploader < CarrierWave::Uploader::Base
# end
version :thumb do
- process :resize_to_fit => [200, 200]
+ process :resize_to_limit => [200, 200]
end
# Add a white list of extensions which are allowed to be uploaded.
diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
index d65a17e0a..561609315 100644
--- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb
+++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
@@ -2,26 +2,26 @@
<% if at_least_module_manager || sub_manager?(ad_banner_tab)%>
<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
-
- <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+
+ <%= f.label :ad_fx, t('ad.ab_fx') %>
<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
- <%= f.label :transition_sec, t('admin.ad.transition_sec') %>
- <%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+ <%= f.label :transition_sec, t('ad.transition_sec') %>
+ <%= f.text_field :transition_sec,:placeholder=>t('ad.sec_place_holder'),:class=> "span3" %> <%= t("ad.trans_unit_sec") %>
<%if at_least_module_manager%>
- <%= f.label :best_size, t('admin.ad.best_size') %>
+ <%= f.label :best_size, t('ad.best_size') %>
<%= f.text_field :best_size %> Ex: 500px x 300px
<% end -%>
<% end -%>
<% end -%>
-
<%= t("admin.ad.picture_list")%>
+
<%= t("ad.picture_list")%>
<%if (at_least_module_manager || ad_banner_tab.cur_user_is_sub_manager_of(:edit) )%>
<%= content_tag :div ,:class=>'adbanner-action' do%>
- <%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+ <%= link_to t("ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
<% end -%>
<% end -%>
@@ -30,7 +30,7 @@
<% if at_least_module_manager %>
<%= show_ad_banner_permission_link ad_banner_tab%>
- <%= link_to t('admin.ad.delete_banner'),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
+ <%= link_to t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
<% end -%>
<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb
index 0b4277a05..15bb75d01 100644
--- a/app/views/admin/ad_banners/_ad_image_update.html.erb
+++ b/app/views/admin/ad_banners/_ad_image_update.html.erb
@@ -1,7 +1,7 @@
<%= image_tag ad_image.file rescue nil%>
- <%= ad_image.display? ? "[#{t('admin.ad.showing')}]" : "[#{t('admin.ad.not_showing')}]" %>
+ <%= ad_image.display? ? "[#{t('ad.showing')}]" : "[#{t('ad.not_showing')}]" %>
<%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %>
<%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>
diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
index 68e0a9c60..dc77bc5f4 100644
--- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
+++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
@@ -4,33 +4,33 @@
- <%= f.label :title,t('admin.ad.title'),:class => "control-label" %>
+ <%= f.label :title, t(:title),:class => "control-label" %>
<%= f.text_field :title %>
- <%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %>
+ <%= f.label :transition_sec, t('ad.transition_sec'),:class => "control-label" %>
- <%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
+ <%= f.text_field :transition_sec %> <%= t("ad.trans_unit_sec") %>
- <%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %>
+ <%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
<%= f.text_field :best_size %> Ex: 500px x 300px
- <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+ <%= f.label :ad_fx, t('ad.ab_fx') %>
<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index 92c78f5bd..9b2550d55 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -22,7 +22,7 @@
<% end -%>
<% end -%>
- <%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if at_least_module_manager%>
+ <%= content_tag :li,link_to(t('new.banner'),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if at_least_module_manager%>
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index 3ecda29b7..008421bc9 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -19,7 +19,7 @@
-
+
