Compare commits
2 Commits
master
...
update_man
| Author | SHA1 | Date |
|---|---|---|
Manson Wang
|
f1f9754f22 | |
|
Manson Wang
|
80119ec9e8 |
|
|
@ -1,6 +1,4 @@
|
|||
$(function() {
|
||||
var ListCheckData = {},
|
||||
ListCheck = function(element) {
|
||||
var ListCheck = function(element) {
|
||||
this.element = $(element);
|
||||
this.element.data('exists', true);
|
||||
if(this.element.context.parentNode.tagName == "TD") {
|
||||
|
|
@ -11,72 +9,49 @@ $(function() {
|
|||
this.elementWrap.addClass('listCheckHead');
|
||||
}
|
||||
this.element.before('<i class="icon-check-empty" />');
|
||||
};
|
||||
};
|
||||
|
||||
$.fn.listCheck = function () {
|
||||
$(this).each(function() {
|
||||
var $this = $(this),
|
||||
$el = $this.find('input[type="checkbox"]');
|
||||
$el.each(function (i) {
|
||||
$.fn.listCheck = function (callback) {
|
||||
this.each(function (i) {
|
||||
if(!$(this).data('exists')) {
|
||||
new ListCheck(this);
|
||||
};
|
||||
});
|
||||
$this.on(clickEvent, $el, function(e) {
|
||||
if($(e.target).prop('checked')) {
|
||||
$(e.target).siblings('i').addClass('icon-check').removeClass('icon-check-empty').closest('tr').addClass('checkHit');
|
||||
this.on(clickEvent, function(e) {
|
||||
if($(this).prop('checked')) {
|
||||
$(this).siblings('i').addClass('icon-check').removeClass('icon-check-empty').closest('tr').addClass('checkHit');
|
||||
} else {
|
||||
$(e.target).siblings('i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit');
|
||||
$(this).siblings('i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit');
|
||||
};
|
||||
if($(e.target).closest('th').hasClass('listCheckHead')) {
|
||||
$this.find('.listCheck input[type="checkbox"]').prop('checked', $(e.target).prop('checked'));
|
||||
if($(e.target).prop('checked')) {
|
||||
$this.find('.listCheck i').addClass('icon-check').removeClass('icon-check-empty').closest('tr').addClass('checkHit');
|
||||
if ($(this).closest('.listCheckHead').length) {
|
||||
$('.listCheck .list-check').prop('checked', $(this).prop('checked'));
|
||||
if($(this).prop('checked')) {
|
||||
$('.listCheck i').addClass('icon-check').removeClass('icon-check-empty').closest('tr').addClass('checkHit');
|
||||
} else {
|
||||
$this.find('.listCheck i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit');
|
||||
$('.listCheck i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit');
|
||||
}
|
||||
};
|
||||
|
||||
var _isCheck = $this.find('tbody').find($el).filter(':checked').length,
|
||||
_defaultLength = $this.find('tbody').find($el).length;
|
||||
var _isCheck = $('tbody .list-check').filter(':checked').length,
|
||||
_defaultLength = $('tbody .list-check').length;
|
||||
|
||||
if(_isCheck > 0 && _isCheck < _defaultLength) {
|
||||
$this.find('.listCheckHead i').removeClass('icon-check-empty icon-check').addClass('icon-minus');
|
||||
$('.listCheckHead i').removeClass('icon-check-empty icon-check').addClass('icon-minus');
|
||||
} else if(!_isCheck) {
|
||||
$this.find('.listCheckHead i').removeClass('icon-minus icon-check').addClass('icon-check-empty');
|
||||
$('.listCheckHead i').removeClass('icon-minus icon-check').addClass('icon-check-empty');
|
||||
} else {
|
||||
$this.find('.listCheckHead i').removeClass('icon-check-empty icon-minus').addClass('icon-check');
|
||||
$('.listCheckHead i').removeClass('icon-check-empty icon-minus').addClass('icon-check');
|
||||
}
|
||||
_isCheck ? $this.find('.list-active-btn').removeClass('disabled').data('actionable', true) : $this.find('.list-active-btn').addClass('disabled').data('actionable', false);
|
||||
_isCheck ? $('.list-active-btn').removeClass('disabled').data('actionable', true) : $('.list-active-btn').addClass('disabled').data('actionable', false);
|
||||
});
|
||||
$this.on(clickEvent, '.list-active-btn', function(e) {
|
||||
if(!$(this).hasClass('disabled')) {
|
||||
ListCheckData.url = $(this).attr('rel');
|
||||
ListCheckData.name = $this.find('tbody').find('input[type="checkbox"]').attr('name');
|
||||
ListCheckData.action = $(this).data('checkAction');
|
||||
ListCheckData.values = [];
|
||||
ListCheckData.element = $this
|
||||
$this.find('tbody').find('input[type="checkbox"]').each(function (i) {
|
||||
this.checked && ListCheckData.values.push("ids[]=" + this.value);
|
||||
});
|
||||
console.log(ListCheckData.values.join("&"));
|
||||
$('#dialog').modal('show');
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
clearCheck($(this));
|
||||
};
|
||||
|
||||
function clearCheck(element) {
|
||||
element.find('input[type="checkbox"]').each(function() {
|
||||
$(this).prop('checked', false).siblings('i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit');
|
||||
});
|
||||
element.find('.list-active-btn').addClass('disabled');
|
||||
};
|
||||
|
||||
function actionSuccess(e) {
|
||||
ListCheckData.element.find('tbody').find('input[type="checkbox"]').each(function() {
|
||||
};
|
||||
function clearCheck() {
|
||||
$('.list-check').each(function() {
|
||||
$(this).prop('checked', false);
|
||||
})
|
||||
}
|
||||
function actionSuccess(e) {
|
||||
$("tbody .list-check").each(function() {
|
||||
switch(e) {
|
||||
case 'list-be-hide':
|
||||
$(this).filter(':checked').closest('tr').addClass('checkHide');
|
||||
|
|
@ -92,17 +67,32 @@ $(function() {
|
|||
};
|
||||
$('.list-check').siblings('i').removeAttr('class').addClass('icon-check-empty').closest('tr').removeClass('checkHit');
|
||||
});
|
||||
clearCheck(ListCheckData.element);
|
||||
}
|
||||
clearCheck();
|
||||
}
|
||||
$(function() {
|
||||
var $t = null,
|
||||
_data = null;
|
||||
clearCheck();
|
||||
$('.list-check').listCheck();
|
||||
$('.list-active-btn').data('actionable', false).on(clickEvent, function(e) {
|
||||
$t = $(this)
|
||||
_data = $(this).data()
|
||||
_data.actionable ? $('#dialog').modal('show') : "";
|
||||
e.preventDefault();
|
||||
});
|
||||
$('.delete-item').on(clickEvent, function() {
|
||||
if(ListCheckData.url.indexOf("?") > -1) {
|
||||
$.ajax(ListCheckData.url + "&" + ListCheckData.values.join("&")).done(function() {
|
||||
actionSuccess(ListCheckData.action);
|
||||
var _v = [];
|
||||
$("tbody .list-check").each(function() {
|
||||
this.checked && _v.push("ids[]="+this.value)
|
||||
});
|
||||
var _t = $t.attr("rel");
|
||||
if(_t.indexOf("?") > -1) {
|
||||
$.ajax(_t + "&" + _v.join("&")).done(function() {
|
||||
actionSuccess(_data.checkAction)
|
||||
});
|
||||
} else {
|
||||
$.ajax(ListCheckData.url + "?" + ListCheckData.values.join("&")).done(function() {
|
||||
actionSuccess(ListCheckData.action);
|
||||
$.ajax(_t + "?" + _v.join("&")).done(function() {
|
||||
actionSuccess(_data.checkAction)
|
||||
});
|
||||
}
|
||||
$('#dialog').modal('hide');
|
||||
|
|
|
|||
|
|
@ -2,19 +2,12 @@ $(function() {
|
|||
$(".post_preview").click(function(){
|
||||
$("#main-wrap").after("<span id='show_preview'></span>");
|
||||
|
||||
var preview_url = $(this).attr('url');
|
||||
|
||||
$("form.previewable").ajaxSubmit({
|
||||
beforeSubmit: function(a,f,o){
|
||||
o.dataType = 'script';
|
||||
o.url = preview_url;
|
||||
o.type = 'post';
|
||||
},success: function(msg) {
|
||||
$('#show_preview .modal').modal()
|
||||
$.post($(this).attr('url'), $(".previewable").serialize() ,function(data){
|
||||
$('#show_preview .modal').modal();
|
||||
$('#show_preview .modal').height(function() {
|
||||
return $(window).height() * 0.7;
|
||||
});
|
||||
}});
|
||||
},'script');
|
||||
});
|
||||
$(".preview_trigger").click(function(){
|
||||
$("#main-wrap").after("<span id='show_preview'></span>");
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
vertical-align: middle;
|
||||
padding: 0 0 0 10px!important;
|
||||
}
|
||||
.listCheckHead input[type="checkbox"],
|
||||
.listCheck input[type="checkbox"] {
|
||||
.listCheckHead .list-check,
|
||||
.listCheck .list-check {
|
||||
position: absolute;
|
||||
margin: -12px 0 0 -1px;
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
|
||||
|
|
|
|||
|
|
@ -1,48 +1,9 @@
|
|||
class Admin::ModuleStoreController < OrbitBackendController
|
||||
|
||||
@@store = STORE_CONFIG[:store_settings]["url"]
|
||||
|
||||
def index
|
||||
@extensions = get_extensions
|
||||
end
|
||||
|
||||
def show
|
||||
@extension = get_extension(params[:id]) rescue nil
|
||||
end
|
||||
|
||||
def download
|
||||
#get extension related values
|
||||
extension = get_extension(params[:id]) rescue nil
|
||||
download_link = @@store + "/"+ extension["extension"]["extension"]["url"]
|
||||
downloaded_file_name = extension["extension_filename"]
|
||||
module_app_name = downloaded_file_name.split(/(.zip)/).first
|
||||
|
||||
#check if the directory exists or not
|
||||
@module_status = Dir.exists?("#{Rails.root}/vendor/built_in_modules/#{module_app_name}")
|
||||
if @module_status.eql?(true)
|
||||
flash[:notice] = "This module is already installed"
|
||||
else
|
||||
download_extension(download_link, downloaded_file_name,module_app_name)
|
||||
flash[:notice] = "This module has been successfully installed"
|
||||
end
|
||||
redirect_to admin_module_store_path
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def get_extensions
|
||||
JSON.parse(open("#{@@store}/api/extensions").read)
|
||||
end
|
||||
|
||||
def get_extension(id)
|
||||
JSON.parse(open("#{@@store}/api/extensions/#{id}").read)
|
||||
end
|
||||
|
||||
def download_extension(download_link, downloaded_file_name,module_app_name)
|
||||
puts %x(wget "#{download_link}")
|
||||
puts %x(unzip "#{downloaded_file_name}")
|
||||
puts %x(mv #{module_app_name} "#{Rails.root}/vendor/built_in_modules/")
|
||||
puts %x(rm "#{downloaded_file_name}")
|
||||
site_restart
|
||||
end
|
||||
end
|
||||
|
|
@ -36,26 +36,6 @@ class Admin::PagesController < Admin::ItemsController
|
|||
@item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
|
||||
end
|
||||
if @item.update_attributes(params[:page])
|
||||
unless params[:page]['frontend_field'].nil?
|
||||
frontend_class = []
|
||||
frontend_field_name = []
|
||||
frontend_sat_to_link = []
|
||||
|
||||
params[:page]['frontend_field'].each do |field|
|
||||
frontend_class << field['class']
|
||||
frontend_field_name << field['field_name']
|
||||
frontend_sat_to_link << field['sat_to_link']
|
||||
end
|
||||
|
||||
@item['frontend_class'] = frontend_class
|
||||
@item['frontend_field_name'] = frontend_field_name
|
||||
@item['frontend_sat_to_link'] = frontend_sat_to_link
|
||||
end
|
||||
|
||||
@item['tag'] = params[:page]['tag'] == nil ? [] : params[:page]['tag']
|
||||
|
||||
@item.save
|
||||
|
||||
render 'admin/items/reload_items'
|
||||
else
|
||||
@error = error_messages_for(@item)
|
||||
|
|
|
|||
|
|
@ -72,10 +72,7 @@ class Admin::SitesController < OrbitBackendController
|
|||
end
|
||||
|
||||
def system_info
|
||||
@disk_free = `df -h /`.gsub("\n","<br/>").html_safe
|
||||
@nginx_version = %x[/opt/nginx/sbin/nginx -v 2>&1].gsub("\n","<br/> ").html_safe
|
||||
@mongo_version = `mongod --version`.split("\n")[0].html_safe
|
||||
@linux_version = `lsb_release -d`.split(":")[1].html_safe
|
||||
|
||||
end
|
||||
|
||||
def search_engine
|
||||
|
|
|
|||
|
|
@ -1,95 +1,22 @@
|
|||
require 'net/http'
|
||||
require 'uri'
|
||||
require 'fileutils'
|
||||
require 'zip/zip'
|
||||
class Admin::TemplateStoreController < OrbitBackendController
|
||||
|
||||
|
||||
@@store_domain = STORE_CONFIG[:store_settings]["url"]
|
||||
@@store_domain = "http://store.tp.rulingcom.com"
|
||||
def index
|
||||
@store = @@store_domain
|
||||
@design_ids = Design.all.map{|d| d.template_store_id}
|
||||
@templates = JSON.parse(get_templates)
|
||||
end
|
||||
|
||||
def show
|
||||
@store = @@store_domain
|
||||
@design_ids = Design.all.map{|d| d.template_store_id}
|
||||
@template = JSON.parse(get_template(params[:id])) rescue nil
|
||||
end
|
||||
|
||||
def download_theme
|
||||
url = @@store_domain + params["url"]
|
||||
url_base = url.split('/')[2]
|
||||
url_path = '/'+url.split('/')[3..-1].join('/')
|
||||
Net::HTTP.start(url_base) do |http|
|
||||
open("public/#{params['slug']}.zip", "wb") do |file|
|
||||
http.get(url_path) do |str|
|
||||
file.write(str)
|
||||
end
|
||||
end
|
||||
end
|
||||
upload_package("#{params['slug']}.zip", params["id"])
|
||||
File.delete("public/#{params['slug']}.zip")
|
||||
render :json => {"success"=>true,"url"=>@@store_domain + params["url"]}.to_json
|
||||
render :json => {"success"=>true}.to_json
|
||||
end
|
||||
protected
|
||||
|
||||
def upload_package(package_name,template_store_id)
|
||||
|
||||
temp_file = Tempfile.new("temp_file")
|
||||
original_file = File.open("#{Rails.root}/public/#{package_name}")
|
||||
temp_file.write(original_file.read.force_encoding('UTF-8'))
|
||||
temp_file.rewind
|
||||
filename = File.basename(original_file,".zip")
|
||||
unzip_design(temp_file, filename, template_store_id)
|
||||
temp_file.close
|
||||
|
||||
end
|
||||
|
||||
def unzip_design(file, zip_name, template_store_id)
|
||||
Zip::ZipFile.open(file) { |zip_file|
|
||||
design = Design.new.from_json(zip_file.read("#{zip_name}/info.json"))
|
||||
design.template_store_id = template_store_id
|
||||
Dir.mktmpdir('f_path') { |dir|
|
||||
themes_entries = []
|
||||
javascripts_entries = []
|
||||
images_entries = []
|
||||
|
||||
zip_file.entries.each do |entry|
|
||||
case (path = entry.to_s)
|
||||
when /\A(#{zip_name})\/(default\.css)\z/ #for default css
|
||||
design.build_css_default(:file => get_temp_file(zip_file, dir, entry))
|
||||
when /\A(#{zip_name})\/(reset\.css)\z/ #for reset css
|
||||
design.build_css_reset(:file => get_temp_file(zip_file, dir, entry))
|
||||
when /\A(#{zip_name})\/(layout\.html)\z/ #for layout html
|
||||
design.build_layout(:file => get_temp_file(zip_file, dir, entry))
|
||||
when /\A(#{zip_name})\/(themes)\/.*(\.css)\z/ #for themes css
|
||||
themes_entries << entry
|
||||
when /\A(#{zip_name})\/(javascripts)\/.*(\.js)\z/ #for js
|
||||
javascripts_entries << entry
|
||||
when /\A(#{zip_name})\/(images)\/.*((\.jpg)|(\.png)|(\.gif))\z/ #for img
|
||||
images_entries << entry
|
||||
end
|
||||
end
|
||||
|
||||
['themes', 'javascripts', 'images'].each do |type|
|
||||
eval("#{type}_entries").each do |entry|
|
||||
eval("design.#{type}").build(:file => get_temp_file(zip_file, dir, entry))
|
||||
end
|
||||
end
|
||||
}
|
||||
design.save
|
||||
}
|
||||
end
|
||||
|
||||
def get_temp_file(zip_file, dir, entry)
|
||||
filename = File.basename(entry.to_s)
|
||||
temp_file = File.new(dir + '/' + filename, 'w+')
|
||||
temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
|
||||
temp_file
|
||||
end
|
||||
|
||||
def get_template(id)
|
||||
uri = URI.parse("#{@@store_domain}/api/templates/#{id}")
|
||||
http = Net::HTTP.new(uri.host, uri.port)
|
||||
|
|
@ -106,4 +33,6 @@ class Admin::TemplateStoreController < OrbitBackendController
|
|||
response.body
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
class OrbitBackendController < ApplicationController
|
||||
include OrbitCategory::Categorizing
|
||||
include OrbitCoreLib::Authorization
|
||||
include OrbitCoreLib::PermissionUtility
|
||||
include OrbitTag::Tagging
|
||||
include AdminHelper
|
||||
include ApplicationHelper
|
||||
|
|
|
|||
|
|
@ -197,8 +197,8 @@ class PagesController < ApplicationController
|
|||
else
|
||||
model = params[:app_action].classify.constantize rescue nil
|
||||
if !model.nil?
|
||||
item = model.where(:_id=>params[:id]).first
|
||||
@item = Item.where(:category => [item.category_id.to_s]).first if !module_app.has_category.blank? and !item.blank?
|
||||
item = model.find(params[:id])
|
||||
@item = Item.where(:category => [item.category_id.to_s]).first if !module_app.has_category.blank?
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -193,8 +193,8 @@ module ApplicationHelper
|
|||
stylesheets = ''
|
||||
stylesheets << "<link href='#{asset_path 'orbit_bar_bootstrap'}' rel='stylesheet' type='text/css' />\n"
|
||||
stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
|
||||
# stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n"
|
||||
# stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
|
||||
stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n"
|
||||
stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
|
||||
stylesheets << "<link href='#{page.design.css_default.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_default
|
||||
theme = page.design.themes.detect{ |d| d.id == page.theme_id }
|
||||
stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ module OrbitBackendHelper
|
|||
|
||||
def show_form_status_field(object)
|
||||
#by_object = (!object.is_expired? and object.is_pending?)
|
||||
by_user = ((object.category.user_is_authorized_by_title?(current_user,"category_approval_#{@module_app.key}") rescue nil) or is_manager? or is_admin?)
|
||||
by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin? or is_sub_manager?)
|
||||
by_user
|
||||
end
|
||||
|
||||
def show_approval_link(object)
|
||||
by_object = (!object.is_expired? and object.is_pending?)
|
||||
by_user = ((object.category.user_is_authorized_by_title?(current_user,"category_approval_#{@module_app.key}") rescue nil) or is_manager? or is_admin?)
|
||||
by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin? or is_sub_manager?)
|
||||
by_object and by_user
|
||||
end
|
||||
|
||||
|
|
@ -271,31 +271,17 @@ module OrbitBackendHelper
|
|||
# TODO: links to other actions
|
||||
# ===============================================================
|
||||
def footer(args={})
|
||||
|
||||
if args[:link_name]
|
||||
link_name = args[:link_name]
|
||||
else
|
||||
link_name = content_tag(:i, nil, :class => 'icon-plus') + ' ' + t(:add)
|
||||
end
|
||||
|
||||
paginate = args.has_key?(:paginate) ? args[:paginate] : true
|
||||
link = (is_manager? || is_sub_manager? rescue nil) && args.has_key?(:link) ? true : false
|
||||
if paginate || link
|
||||
@index_footer = content_tag :div, class: "bottomnav clearfix" do
|
||||
concat content_tag :div, link_to(link_name, args[:link].blank? ? '#' : send(args[:link]), :class => (args[:link_class] || 'btn btn-primary'), data: args[:link_data]), class: "action pull-right" if link
|
||||
concat content_tag :div, link_to(content_tag(:i, nil, :class => 'icon-plus') + ' ' + t(:add), args[:link].blank? ? '#' : send(args[:link]), :class => (args[:link_class] || 'btn btn-primary'), data: args[:link_data]), class: "action pull-right" if link
|
||||
concat content_tag :div, paginate(@objects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]}), class: "pagination pagination-centered" if paginate
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def get_quick_link(quick, object, authorization, approvable)
|
||||
|
||||
if !quick[:link_option].blank?
|
||||
link_option = ",#{quick[:link_option]}"
|
||||
else
|
||||
link_option = ""
|
||||
end
|
||||
|
||||
case quick[:type]
|
||||
when 'approval'
|
||||
if show_approval_link(object)
|
||||
|
|
@ -306,13 +292,13 @@ module OrbitBackendHelper
|
|||
content_tag :li, link_to(t(quick[:translation] || :authorization_), eval("#{quick[:link]}"), class: "preview_trigger #{quick[:class]}")
|
||||
end
|
||||
when 'edit'
|
||||
if authorization && approvable || is_manager?
|
||||
content_tag :li, link_to(t(quick[:translation] || :edit), quick[:link].nil? ? '#' : eval("#{quick[:link]}('#{object.id}'#{link_option})"), class: quick[:class], data: eval("#{quick[:data]}"))
|
||||
if authorization && approvable
|
||||
content_tag :li, link_to(t(quick[:translation] || :edit), quick[:link].nil? ? '#' : eval("#{quick[:link]}('#{object.id}')"), class: quick[:class], data: eval("#{quick[:data]}"))
|
||||
end
|
||||
when 'delete'
|
||||
if show_delete_link(object)
|
||||
@delete_options = {title: quick[:title], warning: quick[:warning], cancel: quick[:cancel], submit: quick[:submit]}
|
||||
content_tag :li, link_to(t(quick[:translation] || :delete_), '#', rel: eval("#{quick[:link]}('#{object.id}'#{link_option})"), class: "delete #{quick[:class] || 'text-error'}")
|
||||
content_tag :li, link_to(t(quick[:translation] || :delete_), '#', rel: eval("#{quick[:link]}('#{object.id}')"), class: "delete #{quick[:class] || 'text-error'}")
|
||||
end
|
||||
when 'detail'
|
||||
content_tag :li, link_to(t(quick[:translation] || :detail), '#', class: (quick[:class] || "detail-row"))
|
||||
|
|
@ -320,20 +306,10 @@ module OrbitBackendHelper
|
|||
if show_reject_reason(object)
|
||||
content_tag :li, link_to(t(quick[:translation] || :rejected_reason) + ' ' + truncate(object.not_checked_reason, :length => 10), '#', rel: "tooltip", 'data-original-title' => (wrap_string_with(object.not_checked_reason, :line_width => 24)), class: "reject_info #{quick[:class]}")
|
||||
end
|
||||
else
|
||||
if quick[:define_link]
|
||||
if quick[:condition_option]
|
||||
if eval("#{quick[:condition_option]}")
|
||||
content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:define_link]}"), class: quick[:class])
|
||||
end
|
||||
else
|
||||
content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:define_link]}"), class: quick[:class])
|
||||
end
|
||||
else
|
||||
content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def get_sorted_objects(objects, field)
|
||||
if field
|
||||
|
|
@ -443,10 +419,6 @@ module OrbitBackendHelper
|
|||
res << "<li class='active'>#{t(:search_engine)}</li>"
|
||||
when 'site_info'
|
||||
res << "<li class='active'>#{t(:site_info)}</li>"
|
||||
when 'update_manager'
|
||||
res << "<li class='active'>#{t(:update_manager)}</li>"
|
||||
when 'system_info'
|
||||
res << "<li class='active'>#{t("site.system_preference")}</li>"
|
||||
end
|
||||
when 'items'
|
||||
res << "<li class='active'>#{t(:structure)}</li>"
|
||||
|
|
|
|||
|
|
@ -2,30 +2,28 @@ class CronMail < ActionMailer::Base
|
|||
default :from => "orbit_test@rulingcom.com"
|
||||
|
||||
def get_settings
|
||||
@site = Site.first
|
||||
# @@smtp_settings = {
|
||||
# :address => "smtp.gmail.com",
|
||||
# :port => '587',
|
||||
# :domain => "smtp.gmail.com",
|
||||
# :authentication => "plain",
|
||||
# :user_name => "redmine@rulingcom.com",
|
||||
# :password => "rulingredmine",
|
||||
# :tls => true,
|
||||
# :enable_starttls_auto => true
|
||||
# }
|
||||
@@smtp_settings = {
|
||||
:enable_starttls_auto => @site['site_settings']['enable_starttls_auto'],
|
||||
:address => @site['site_settings']['address'],
|
||||
:port => @site['site_settings']['port'],
|
||||
:domain => @site['site_settings']['domain'],
|
||||
:authentication => @site['site_settings']['authentication'],
|
||||
:user_name => @site['site_settings']['user_name'],
|
||||
:password => @site['site_settings']['password']
|
||||
:address => @site['mail_settings']['address'],
|
||||
:port => @site['mail_settings']['port'],
|
||||
:domain => @site['mail_settings']['domain'],
|
||||
:authentication => @site['mail_settings']['authentication'],
|
||||
:user_name => @site['mail_settings']['user_name'],
|
||||
:password => @site['mail_settings']['password'],
|
||||
:tls => @site['mail_settings']['tls'],
|
||||
:enable_starttls_auto => @site['mail_settings']['enable_starttls_auto']
|
||||
}
|
||||
end
|
||||
|
||||
def self.smtp_settings
|
||||
@site = Site.first
|
||||
@@smtp_settings = {
|
||||
:enable_starttls_auto => @site['site_settings']['enable_starttls_auto'],
|
||||
:address => @site['site_settings']['address'],
|
||||
:port => @site['site_settings']['port'],
|
||||
:domain => @site['site_settings']['domain'],
|
||||
:authentication => @site['site_settings']['authentication'],
|
||||
:user_name => @site['site_settings']['user_name'],
|
||||
:password => @site['site_settings']['password']
|
||||
}
|
||||
end
|
||||
|
||||
def time_check(msg)
|
||||
get_settings
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ class Design
|
|||
field :intro, :type => String
|
||||
field :title, :type => String
|
||||
field :version, :type => String
|
||||
field :template_store_id, :type => String
|
||||
|
||||
mount_uploader :zip_file, AssetUploader
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,6 @@ class ModuleApp
|
|||
# authorization
|
||||
def update_auth_approval_users
|
||||
user_ids = self.auth_approvals.inject([]) do |users, auth|
|
||||
auth = auth.class.find(auth.id)
|
||||
users += auth.authorized_users.map{|user| user.id}
|
||||
end
|
||||
self.update_attribute(:auth_approval_users, user_ids.uniq)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
|
|||
# end
|
||||
|
||||
version :thumb do
|
||||
process :resize_to_fit => [200, 200]
|
||||
process :resize_to_fit => [80, 80]
|
||||
end
|
||||
|
||||
# Add a white list of extensions which are allowed to be uploaded.
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
|
||||
|
||||
<li title="<%= t("site.system_preference") %>"><%= link_to admin_site_system_info_path(@site), :class => active_for_action('sites', 'system_info') do %><span><i class="icons-info-2"></i></span><%end%></li>
|
||||
</ul>
|
||||
<!-- <li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
|
||||
--> </ul>
|
||||
</div>
|
||||
<div class="sub-nav-arrow"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,14 +14,8 @@
|
|||
<%= javascript_include_tag 'lib/retina' %>
|
||||
<%= javascript_include_tag 'lib/mudole_templates_status' %>
|
||||
</head>
|
||||
<!--
|
||||
<% @extensions.each do |extension|%>
|
||||
<%=link_to extension["title"], admin_module_store_show_path(extension["_slugs"][0])%>
|
||||
<%end%> -->
|
||||
|
||||
<%= flash[:notice] rescue nil%>
|
||||
|
||||
<table id="mt-list" class="table main-list">
|
||||
<table id="mt-list" class="table main-list">
|
||||
<thead>
|
||||
<tr class="sort-header">
|
||||
<th class="first"><a href="#">Module Title</a></th>
|
||||
|
|
@ -31,38 +25,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @extensions.each do |extension|%>
|
||||
<tr>
|
||||
<td class="detail-row">
|
||||
<div class="module_icon pull-left">
|
||||
<%= image_tag "module_icon.png"%>
|
||||
</div>
|
||||
<h5 class="mt_title"><span><%=link_to extension["title"], admin_module_store_show_path(extension["_slugs"][0])%></span></h5>
|
||||
<p class="mt_dev muted"><%=extension["author"]%></p>
|
||||
</td>
|
||||
<td class="detail-row">2013/07/12</td>
|
||||
<td>
|
||||
<%= extension["description"].html_safe%> <%= link_to 'Read More', admin_module_store_show_path(extension["_slugs"][0]) %>
|
||||
</td>
|
||||
<!-- <td class="active"><button class="act btn btn-mini" type="button">Uninstall</button></td>
|
||||
-->
|
||||
<% download_link = STORE_CONFIG[:store_settings]["url"] + "/"+ extension["extension"]["extension"]["url"]
|
||||
downloaded_file_name = extension["extension_filename"]
|
||||
module_app_name = downloaded_file_name.split(/(.zip)/).first
|
||||
@module_status = Dir.exists?("#{Rails.root}/vendor/built_in_modules/#{module_app_name}")
|
||||
%>
|
||||
<% if @module_status.eql?(true)%>
|
||||
<td class="active">Installed</td>
|
||||
<% else %>
|
||||
<td class="active"><%= link_to 'Download', admin_module_store_download_path(:id => extension["_slugs"][0]), :class=>"act btn btn-mini btn-success" %></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
<!--
|
||||
<tr>
|
||||
<td class="detail-row">
|
||||
<div class="module_icon pull-left">
|
||||
|
|
@ -118,5 +80,6 @@
|
|||
@detail
|
||||
</td>
|
||||
<td class="active"><button class="act btn btn-mini btn-info" type="button">Update</button></td>
|
||||
</tr> -->
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<div class="side">
|
||||
<div id="item-info">
|
||||
<img src="/assets/module/thumb/mt<%= params[:m] %>.jpg" alt="" class="item-thumb">
|
||||
<h2 class="item-name"><%= @extension.first["title"] %></h2>
|
||||
<h2 class="item-name">Module Name</h2>
|
||||
<a id="download" href="">free download</a>
|
||||
<ul class="item-extra-info">
|
||||
<li><span class="title">downloads</span><span class="count"><%= Random.new.rand(10..100) %></span></li>
|
||||
|
|
@ -38,12 +38,16 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="main clearfix">
|
||||
<h3>Description</h3>
|
||||
<div id="desc-holder" class="paragraph"><%= @extension.first["description"].html_safe%></div>
|
||||
<h3>description</h3>
|
||||
<div id="desc-holder" class="paragraph">Pixel Union’s Jitensha defines storefront minimalism. Japanese for “bicycle,” Jitensha offers clean typography and easy usability, including full color, font, logo, and footer customization. With its painless social media and blog integration, Jitensha gorgeously accomodates every aspect of your business. Any questions before you launch? Don’t hesitate to email us: Support@PixelUnion.net.</div>
|
||||
<h3>screen shot</h3>
|
||||
<div id="screen-shot">
|
||||
<div class="holder">
|
||||
<%= image_tag "#{STORE_CONFIG[:store_settings]["url"]}/#{@extension.first['preview']['preview']['url']}"%>
|
||||
<img src="" alt="Thumbnail 1" class="preview item-thumb">
|
||||
<img src="" alt="Thumbnail 2" class="preview item-thumb">
|
||||
<img src="" alt="Thumbnail 3" class="preview item-thumb">
|
||||
<img src="" alt="Thumbnail 4" class="preview item-thumb">
|
||||
<img src="" alt="Thumbnail 5" class="preview item-thumb">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
<li title="<%= t('update_manager') %>"><%= link_to admin_site_update_manager_path(@site), :class => active_for_action('sites', 'update_manager') do %><span><i class="icon-refresh"></i></span><%end%></li>
|
||||
|
||||
<li title="<%= t("site.system_preference") %>"><%= link_to admin_site_system_info_path(@site), :class => active_for_action('sites', 'system_info') do %><span><i class="icons-info-2"></i></span><%end%></li>
|
||||
</ul>
|
||||
<!-- <li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
|
||||
--> </ul>
|
||||
</div>
|
||||
<div class="sub-nav-arrow"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
<div class="control-group">
|
||||
<label class="control-label muted"><%= t 'mail.domain' %></label>
|
||||
<div class="controls">
|
||||
<%= f.text_field :domain, :value => (@site['site_settings']['domain'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
|
||||
<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
<div class="control-group">
|
||||
<label class="control-label muted"><%= t 'mail.password' %></label>
|
||||
<div class="controls">
|
||||
<%= f.password_field :password, :value => (@site['site_settings']['password'] rescue nil), :class=>"input-large", :placeholder=>"Password" %>
|
||||
<%= f.text_field :password, :value => (@site['site_settings']['password'] rescue nil), :class=>"input-large", :placeholder=>"Password" %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
<h1><%= I18n.t("site.system_preference") %></h1>
|
||||
<ul class="nav nav-tabs" id="myTab">
|
||||
<li class="active"><a href="#summary" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_summary") %></a></li>
|
||||
<li><a href="#commits" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_commits") %></a></li>
|
||||
<li><a href="#backups" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_backups") %></a></li>
|
||||
<li><a href="#resque_logs" data-toggle="tab"><%= I18n.t("site.system_preference_.tab_logs") %></a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active in" id="summary">
|
||||
<h2><%= I18n.t("site.system_preference_.summary.disk_space") %>:</h2>
|
||||
<%= content_tag :p,@site.disk_space.gsub(/\n/,"<br />").html_safe if @site.disk_space %>
|
||||
<h2><%= I18n.t("site.system_preference_.summary.code_update_at") %>: </h2>
|
||||
<% @site.system_package_info.each do |index,value| %>
|
||||
<h2><%= index.titleize %> <%= I18n.t("site.system_preference_.summary.version") %>:</h2>
|
||||
<%= content_tag :p,value %>
|
||||
<% end %>
|
||||
<h2><%= I18n.t("site.system_preference_.summary.weekness_report") %>:<%= '' %></h2>
|
||||
</div>
|
||||
<div class="tab-pane" id="commits">
|
||||
<% if @git_commit_list_file %>
|
||||
<% @git_commit_list_file.lines do |line|%>
|
||||
<%= line %><br/>
|
||||
<% end%>
|
||||
<% else %>
|
||||
<div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="tab-pane" id="backups">
|
||||
<%if @db_backup_list_file %>
|
||||
<% @db_backup_list_file.lines do |line|%>
|
||||
<%=line %><br/>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="tab-pane" id="resque_logs">
|
||||
<%if @db_backup_list_file %>
|
||||
<% @resque_logs_file.lines do |line|%>
|
||||
<%=line %><br/>
|
||||
<% end if @resque_logs_file%>
|
||||
<%else %>
|
||||
<div class="well"><%= I18n.t("site.system_preference_.summary.no_data") %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
});
|
||||
})
|
||||
});
|
||||
$(document).on('click', 'li .map-block .onoff', function () {
|
||||
$(document).on('click', 'li .onoff', function () {
|
||||
$(this).parents("li").toggleClass("disabled");
|
||||
if($(this).parents("li").attr("class").indexOf("disabled") > 0){
|
||||
$(this).text("<%= t('off_upcase') %>")
|
||||
|
|
|
|||
|
|
@ -1,126 +1,5 @@
|
|||
<%= stylesheet_link_tag "lib/wrap-nav" %>
|
||||
<%= stylesheet_link_tag "lib/main-list" %>
|
||||
<%= stylesheet_link_tag "lib/main-forms" %>
|
||||
<%= stylesheet_link_tag "lib/fileupload.css" %>
|
||||
<%= stylesheet_link_tag "lib/togglebox.css" %>
|
||||
<%= stylesheet_link_tag "lib/list-check.css" %>
|
||||
|
||||
<%= javascript_include_tag "lib/site_set" %>
|
||||
<%= javascript_include_tag "lib/list-check" %>
|
||||
|
||||
<% content_for :side_bar do %>
|
||||
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
|
||||
<% end %>
|
||||
|
||||
<form class="form-horizontal main-forms">
|
||||
<fieldset>
|
||||
<div class="input-area">
|
||||
<div class="nav-name"><strong><%= t("preferences.classification") %></strong></div>
|
||||
<ul class="nav nav-pills language-nav">
|
||||
<li class="active"><a href="#overview" data-toggle="tab"><%= t("site.system_preference_.tab_summary") %></a></li>
|
||||
<li><a href="#mail-cron-logs" data-toggle="tab"><%= t("site.system_preference_.tab_send_reminders_log") %></a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<!-- Overview -->
|
||||
<div id="overview" class="tab-pane fade in active">
|
||||
<h3 class="muted"><%= t("site.system_preference_.summary.disk_space") %></h3>
|
||||
<blockquote>
|
||||
<p>
|
||||
<%= @disk_free %>
|
||||
</p>
|
||||
</blockquote>
|
||||
<h3 class="muted">Nginx <%= t("site.system_preference_.summary.version") %></h3>
|
||||
<blockquote>
|
||||
<p>
|
||||
<%= @nginx_version %>
|
||||
</p>
|
||||
</blockquote>
|
||||
</span>
|
||||
<h3 class="muted">MongoDB <%= t("site.system_preference_.summary.version") %></h3>
|
||||
<blockquote>
|
||||
<p>
|
||||
<%= @mongo_version %>
|
||||
</p>
|
||||
</blockquote>
|
||||
<h3 class="muted">Linux <%= t("site.system_preference_.summary.version") %></h3>
|
||||
<blockquote>
|
||||
<p>
|
||||
<%= @linux_version %>
|
||||
</p>
|
||||
</blockquote>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- Email Log -->
|
||||
<div id="mail-cron-logs" class="tab-pane fade">
|
||||
<ul class="nav nav-pills">
|
||||
<li class="active">
|
||||
<a href="#send-log" data-toggle="tab"><%= t(:email_log) %></a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#waiting-sent" data-toggle="tab"><%= t(:email_queue) %></a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane fade in active list-check" id="send-log">
|
||||
<p class="">
|
||||
<a href="#" class="btn list-active-btn disabled" data-check-action="list-be-remove" rel="/panel/announcement/back_end/bulletins/delete"><i class="icons-trash"></i></a>
|
||||
</p>
|
||||
<table class="table main-list table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<input type="checkbox" name="to_delete[]" value="b" />
|
||||
</th>
|
||||
<th><%= t(:sent_date) %></th>
|
||||
<th><%= t(:subject) %></th>
|
||||
<th><%= t(:mail_to) %></th>
|
||||
<th><%= t(:mail_user) %></th>
|
||||
<th><%= t(:mail_from_app) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="tab-pane fade in list-check" id="waiting-sent">
|
||||
<p class="">
|
||||
<a href="#" class="btn list-active-btn disabled" data-check-action="list-be-remove" rel="/panel/announcement/back_end/bulletins/delete"><i class="icons-trash"></i></a>
|
||||
</p>
|
||||
<table class="table main-list table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<input type="checkbox" name="to_delete[]" value="b" />
|
||||
</th>
|
||||
<th><%= t(:sent_date) %></th>
|
||||
<th><%= t(:subject) %></th>
|
||||
<th><%= t(:mail_to) %></th>
|
||||
<th><%= t(:mail_from_app) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
<div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true">
|
||||
<div class="modal-header">
|
||||
<a class="close" data-dismiss="modal">×</a>
|
||||
<h3><%= t(:sure?) %></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<span class="text-warning text-center"><%= t(:this_action_can_not_be_restore) %></span>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal" aria-hidden="true"><%= t(:close) %></button>
|
||||
<button class="delete-item btn btn-danger"><%= t(:delete_) %></button>
|
||||
</div>
|
||||
</div>
|
||||
system_info.html.erb
|
||||
|
|
@ -60,11 +60,7 @@
|
|||
<span class="item-price">Free</span>
|
||||
</span>
|
||||
</a>
|
||||
<% if @design_ids.include?(template["_id"]["$oid"]) %>
|
||||
<%= link_to "Installed", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-success download-link', "disabled"=>"disabled", "data-name"=>template['title'], "data-slug"=>template["_slugs"][0], "data-id"=>template["_id"]["$oid"] %>
|
||||
<% else %>
|
||||
<%= link_to "Download", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-primary download-link', "data-name"=>template['title'], "data-slug"=>template["_slugs"][0], "data-id"=>template["_id"]["$oid"] %>
|
||||
<% end %>
|
||||
<%= link_to "Download", "javascript:void(0);", "data-url" => template['template']['template']['url'], :class=> 'btn btn-primary download-link' %>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
|
|
@ -75,20 +71,20 @@
|
|||
<script type="text/javascript">
|
||||
(function(){
|
||||
$("a.download-link").on(clickEvent,function(){
|
||||
if($(this).attr("disabled") == "disabled")return false;
|
||||
var el = $(this);
|
||||
var el = $(this),
|
||||
downloadurl = $(this).data("url");
|
||||
|
||||
el.removeClass("btn-primary").addClass("btn-info").text("Installing").attr('disabled',"disabled");
|
||||
$.ajax({
|
||||
url : "<%= admin_template_store_download_theme_path %>",
|
||||
data : el.data(),
|
||||
data : {"url" : downloadurl},
|
||||
dataType : "json",
|
||||
type : "post"
|
||||
}).done(function(data){
|
||||
type : "post",
|
||||
success : function(data){
|
||||
if(data.success){
|
||||
el.removeClass('btn-info').addClass('btn-success').text("Installed");
|
||||
}
|
||||
}).fail(function(){
|
||||
el.removeClass('btn-info').addClass('btn-danger').text("Error, please try again.").removeAttr('disabled');
|
||||
}
|
||||
})
|
||||
})
|
||||
})()
|
||||
|
|
|
|||
|
|
@ -8,11 +8,7 @@
|
|||
<div id="item-info">
|
||||
<%= image_tag "#{@store}#{@template['preview']['preview']['thumb']['url']}", :class => "item-thumb" %>
|
||||
<h2 class="item-name"><%= @template['title'] %></h2>
|
||||
<% if @design_ids.include?(@template["_id"]["$oid"]) %>
|
||||
<%= link_to "Installed", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-success download-link', "disabled"=>"disabled", "data-name"=>@template['title'], "data-slug"=>@template["_slugs"][0], "data-id"=>@template["_id"]["$oid"] %>
|
||||
<% else %>
|
||||
<%= link_to "Download", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-primary download-link', "data-name"=>@template['title'], "data-slug"=>@template["_slugs"][0], "data-id"=>@template["_id"]["$oid"] %>
|
||||
<% end %>
|
||||
<%= link_to "Download", "javascript:void(0);", "data-url" => @template['template']['template']['url'], :class=> 'btn btn-primary download-link' %>
|
||||
<ul class="item-extra-info">
|
||||
<li><span class="title">views</span><span class="count"><%= Random.new.rand(10..100) %></span></li>
|
||||
<!-- <li><span class="title">color</span><span class="color-tag green"></span></li> -->
|
||||
|
|
@ -68,22 +64,21 @@
|
|||
<script type="text/javascript">
|
||||
(function(){
|
||||
$("a.download-link").on(clickEvent,function(){
|
||||
if($(this).attr("disabled") == "disabled")return false;
|
||||
var el = $(this);
|
||||
var el = $(this),
|
||||
downloadurl = $(this).data("url");
|
||||
|
||||
el.removeClass("btn-primary").addClass("btn-info").text("Installing").attr('disabled',"disabled");
|
||||
$.ajax({
|
||||
url : "<%= admin_template_store_download_theme_path %>",
|
||||
data : el.data(),
|
||||
data : {"url" : downloadurl},
|
||||
dataType : "json",
|
||||
type : "post"
|
||||
}).done(function(data){
|
||||
type : "post",
|
||||
success : function(data){
|
||||
if(data.success){
|
||||
el.removeClass('btn-info').addClass('btn-success').text("Installed");
|
||||
}
|
||||
}).fail(function(){
|
||||
el.removeClass('btn-info').addClass('btn-danger').text("Error, please try again.").removeAttr('disabled');
|
||||
}
|
||||
})
|
||||
})
|
||||
})()
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<ul class="nav nav-pills">
|
||||
<%= content_tag(:li, link_to(t(:edit),edit_admin_users_new_interface_path(user_for_listing))) if is_admin? %>
|
||||
<%= content_tag(:li, link_to(t("users.setting_privilege"),admin_users_new_interface_edit_privilege_path(user_for_listing))) if is_admin? and current_user.id != user_for_listing.id %>
|
||||
<%= content_tag(:li, link_to(t(:delete_),admin_users_new_interface_path(user_for_listing, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if is_admin? %>
|
||||
<%= content_tag(:li, link_to(t(:delete),admin_users_new_interface_path(user_for_listing, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if is_admin? %>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
<div id="module-content">
|
||||
<div class="nano">
|
||||
<div class="content list-check">
|
||||
<div class="content">
|
||||
<%=render :partial => @right_partial %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<div id="sidebar-menu">
|
||||
<div class="scroller">
|
||||
<ul class="sidebar-nav">
|
||||
<% OrbitApp::Module::SideBarRegisition.all.sort{|x,y| x.get_module_app_key <=> y.get_module_app_key}.each do |t| %>
|
||||
<% OrbitApp::Module::SideBarRegisition.all.each do |t| %>
|
||||
<%= t.render_head(request, params, current_user, @module_app) %>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
</div>
|
||||
|
||||
<div class="sub-nav-block-list">
|
||||
<% OrbitApp::Module::SideBarRegisition.all.sort{|x,y| x.get_module_app_key <=> y.get_module_app_key}.each do |t| %>
|
||||
<% OrbitApp::Module::SideBarRegisition.all.each do |t| %>
|
||||
<%= t.render(request, params, current_user, @module_app) %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
function InsertPreviewImage(){
|
||||
if($("iframe").contents().find('.news_image').length){
|
||||
$("iframe").contents().find('.news_image').append("<a href='' target='_blank'><img src='"+preview_img+"' width='320' /></a>");
|
||||
$("iframe").contents().find('.news_image').append("<a href='' target='_blank'><img src='"+preview_img+"' width='320' height='240' /></a>");
|
||||
}else{
|
||||
setTimeout(InsertPreviewImage,1000);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,5 +63,15 @@ Orbit::Application.configure do
|
|||
config.action_mailer.delivery_method = :smtp
|
||||
config.action_mailer.perform_deliveries = true
|
||||
config.action_mailer.raise_delivery_errors = true
|
||||
config.action_mailer.smtp_settings = {
|
||||
:enable_starttls_auto => true,
|
||||
:openssl_verify_mode => 'none',
|
||||
:address => 'smtp.sendgrid.net',
|
||||
:port => '587',
|
||||
:domain => "new.tp.rulingcom.com",
|
||||
:authentication => "plain",
|
||||
:user_name => "rulingcom",
|
||||
:password => "bjo4xjp6"
|
||||
}
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
if defined?(PhusionPassenger)
|
||||
PhusionPassenger.on_event(:starting_worker_process) do |forked|
|
||||
if forked
|
||||
Resque.redis.client.disconnect
|
||||
Resque.redis = Redis.new(:host => 'localhost', :port => 6379)
|
||||
Resque.redis.namespace = Site.first.resque_namespace rescue APP_CONFIG['orbit']
|
||||
else
|
||||
# We're in conservative spawning mode. We don't need to do anything.
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
data = File.open(File.join(Rails.root, 'config', 'store_config.yml')).read
|
||||
STORE_CONFIG = YAML::load(ERB.new(data).result(binding)).symbolize_keys
|
||||
|
|
@ -86,6 +86,7 @@ en:
|
|||
user_list: Unit
|
||||
approval_: Approval
|
||||
approval_setting: Approval setting
|
||||
archive: Archive
|
||||
asset: Asset
|
||||
attributes: Attributes
|
||||
auth:
|
||||
|
|
@ -192,8 +193,6 @@ en:
|
|||
link: Editing link
|
||||
page: Editing page
|
||||
email: Email
|
||||
email_log: Email Log
|
||||
email_queue: Waiting to be sent
|
||||
enable: Enable
|
||||
enabled_for: Enabled for
|
||||
end: End
|
||||
|
|
@ -225,13 +224,11 @@ en:
|
|||
groups: Groups
|
||||
help: Help
|
||||
hidden: Hidden
|
||||
is_hidden: Hidden
|
||||
hide: Hide
|
||||
hits: Hits
|
||||
homepage: Homepage
|
||||
horizontal: Horizontal
|
||||
hot: Hot
|
||||
is_hot: Hot
|
||||
image: Image
|
||||
images: Images
|
||||
info: Information
|
||||
|
|
@ -265,6 +262,7 @@ en:
|
|||
text_area: Text Area
|
||||
text_field: Text Field
|
||||
locale: Locale
|
||||
location: Location
|
||||
login: Login
|
||||
logout: Logout
|
||||
mail:
|
||||
|
|
@ -278,9 +276,6 @@ en:
|
|||
setting: Mail settings
|
||||
tls: TLS
|
||||
user_name: User Name
|
||||
mail_from_app: Mail From App
|
||||
mail_to: Mail To
|
||||
mail_user: Mail User
|
||||
manager: Manager
|
||||
markup: Markup
|
||||
markup_options: Markup options
|
||||
|
|
@ -347,13 +342,11 @@ en:
|
|||
public_r_tag: System Widget
|
||||
text: Text Area
|
||||
passed: Approved
|
||||
is_checked: Approved
|
||||
password: Password
|
||||
password_change: Change password
|
||||
password_confirmation: Password confirmation
|
||||
password_current: Current password
|
||||
pending: Pending
|
||||
is_pending: Pending
|
||||
personal_plugins:
|
||||
author : "Author"
|
||||
edit_brief_intro : "Edit Brief Intro."
|
||||
|
|
@ -396,7 +389,6 @@ en:
|
|||
register: Register
|
||||
registered: Registered
|
||||
rejected: Rejected
|
||||
is_rejected: Rejected
|
||||
rejected_reason: 'Reason:'
|
||||
rejected_reason_empty: "Approval rejected, no referencable information"
|
||||
related_links: Related Links
|
||||
|
|
@ -434,7 +426,6 @@ en:
|
|||
index: Index
|
||||
summary: Summary
|
||||
thumbnail: Thumbnail
|
||||
sent_date: Sent Date
|
||||
settings: Site Setting
|
||||
site:
|
||||
backend_openness_on: Backend Openness
|
||||
|
|
@ -465,7 +456,6 @@ en:
|
|||
tab_commits: Commits
|
||||
tab_summary: Summary
|
||||
tab_logs: Logs
|
||||
tab_send_reminders_log: Send reminders log
|
||||
summary:
|
||||
code_update_at: Code Update histroy
|
||||
disk_space: Disk Free
|
||||
|
|
@ -495,7 +485,6 @@ en:
|
|||
sub_role: Sub Role
|
||||
sub_role_field: Sub Role Field
|
||||
sub_role_info: " Sub Role Info."
|
||||
subject: Subject
|
||||
subtitle: Subtitle
|
||||
submit: Submit
|
||||
submit_approval: Submit approval
|
||||
|
|
@ -519,12 +508,10 @@ en:
|
|||
text: Text
|
||||
theme: Theme
|
||||
themes: Themes
|
||||
this_action_can_not_be_restore: This action can not be restored, are you sure you want to delete?
|
||||
title: Title
|
||||
to_search: Set as Search Key
|
||||
to_show: Display in frontend
|
||||
top: Top
|
||||
is_top: Top
|
||||
total_visitors: Total Visitors
|
||||
traffic: Traffic
|
||||
type: Field Type
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ zh_tw:
|
|||
user_list: 使用者列表
|
||||
approval_: 審核
|
||||
approval_setting: 審核設定
|
||||
archive: 檔案室
|
||||
asset: 資產
|
||||
attributes: 屬性
|
||||
auth:
|
||||
|
|
@ -192,8 +193,6 @@ zh_tw:
|
|||
link: 編輯連結
|
||||
page: 編輯頁面
|
||||
email: 電子郵件
|
||||
email_log: 寄送紀錄
|
||||
email_queue: 待寄送郵件
|
||||
enable: 開啟
|
||||
enabled_for: 啟用
|
||||
end: 結束
|
||||
|
|
@ -265,6 +264,7 @@ zh_tw:
|
|||
text_area: 文字輸入方塊
|
||||
text_field: 文字輸入框
|
||||
locale: 位置
|
||||
location: 地標
|
||||
login: 登入
|
||||
logout: 登出
|
||||
mail:
|
||||
|
|
@ -278,9 +278,6 @@ zh_tw:
|
|||
setting: 電子郵件設定
|
||||
tls: 電子郵件TLS
|
||||
user_name: 電子郵件帳號
|
||||
mail_from_app: 寄送模組
|
||||
mail_to: 收件者
|
||||
mail_user: 寄件者
|
||||
manager: 管理者
|
||||
markup: 輸入模式
|
||||
markup_options: 標註選項
|
||||
|
|
@ -348,13 +345,11 @@ zh_tw:
|
|||
public_r_tag: 系統模塊
|
||||
text: 文字區域
|
||||
passed: 通過審核
|
||||
is_checked: 通過審核
|
||||
password: 密碼
|
||||
password_change: 更改密碼
|
||||
password_confirmation: 確認密碼
|
||||
password_current: 目前的密碼
|
||||
pending: 待審核
|
||||
is_pending: 待審核
|
||||
personal_plugins:
|
||||
author : "著作人"
|
||||
edit_brief_intro : "編輯摘要"
|
||||
|
|
@ -396,7 +391,6 @@ zh_tw:
|
|||
register: 註冊
|
||||
registered: 已註冊
|
||||
rejected: 拒絕
|
||||
is_rejected: 拒絕
|
||||
rejected_reason: 拒絕原因:'
|
||||
rejected_reason_empty: "拒絕核准, 沒有參考資訊"
|
||||
related_links: 相關連結
|
||||
|
|
@ -434,7 +428,6 @@ zh_tw:
|
|||
index: 檢索
|
||||
summary: 摘要
|
||||
thumbnail: 縮圖
|
||||
sent_date: 寄送日期
|
||||
settings: 基本設定
|
||||
site:
|
||||
frontend_closed: 前台關閉？
|
||||
|
|
@ -465,7 +458,6 @@ zh_tw:
|
|||
tab_commits: 程式版本
|
||||
tab_summary: 總覽
|
||||
tab_logs: 排程工作日誌
|
||||
tab_send_reminders_log: 寄送提醒紀錄
|
||||
summary:
|
||||
code_update_at: 程式更新紀錄
|
||||
disk_space: 硬碟空間
|
||||
|
|
@ -495,7 +487,6 @@ zh_tw:
|
|||
sub_role: 子身份
|
||||
sub_role_field: 子身份欄位
|
||||
sub_role_info: 子身份資料
|
||||
subject: 主題
|
||||
subtitle: 副標題
|
||||
submit: 送出
|
||||
submit_approval: 送出已核准
|
||||
|
|
@ -519,7 +510,6 @@ zh_tw:
|
|||
text: 內文
|
||||
theme: 套用頁面樣式
|
||||
themes: 主題
|
||||
this_action_can_not_be_restore: 刪除後將無法還原，您確定要刪除嗎？
|
||||
title: 標題
|
||||
to_search: 加入搜尋條件
|
||||
to_show: 是否顯示於前台
|
||||
|
|
|
|||
|
|
@ -262,7 +262,6 @@ Orbit::Application.routes.draw do
|
|||
|
||||
match 'module_store' => 'module_store#index'
|
||||
match 'module_store/show' => 'module_store#show'
|
||||
match 'module_store/download' => 'module_store#download'
|
||||
match 'template_store' => 'template_store#index'
|
||||
match 'template_store/download_theme' => "template_store#download_theme"
|
||||
match 'template_store/template/:id' => 'template_store#show', :as => :template_store_template
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
store_settings:
|
||||
url: "http://store.tp.rulingcom.com"
|
||||
|
|
@ -234,7 +234,7 @@ module OrbitCoreLib
|
|||
when :sub_manager
|
||||
@open ||= check_sub_manager
|
||||
when :approver
|
||||
@open ||= check_approver
|
||||
@open ||= check_sub_manager
|
||||
when :user
|
||||
@open ||= true
|
||||
when :visitor
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4,13 +4,9 @@ zh_tw:
|
|||
ad_banner: 廣告輪播
|
||||
banner: 橫幅
|
||||
banner_name: 橫幅名稱
|
||||
name_only_english: 橫幅名稱只能為英文
|
||||
edit_banner: 編輯橫幅
|
||||
enter_number: 請輸入數字
|
||||
enter_url: 請輸入網址
|
||||
banner_name_note: 橫幅名稱只能為英文
|
||||
ste: 轉換間隔時間
|
||||
number_seconds: 請輸入秒數
|
||||
number_milliseconds: 請輸入毫秒數
|
||||
ste_note: 請輸入秒數
|
||||
best_size: 最佳尺寸
|
||||
effect: 效果
|
||||
all: 全部
|
||||
|
|
@ -20,4 +16,3 @@ zh_tw:
|
|||
size: 大小
|
||||
transition_interval: 轉換間隔時間
|
||||
transition_speed: 轉換速度
|
||||
type: 類型
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
|||
end
|
||||
|
||||
def preview
|
||||
params['bulletin']['image'] = nil
|
||||
bulletin = Bulletin.new params
|
||||
@preview_obj = bulletin.to_preview
|
||||
@preview_obj.save
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span1"><%= t('personal_book.year') %></th>
|
||||
<th><%= t('personal_book.book_title') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span1"><%= t('personal_conference.year') %></th>
|
||||
<th><%= t('module_name.personal_conference') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span2"><%= t('date_') %></th>
|
||||
<th><%= t('personal_diploma.school_name') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span2"><%= t('date_') %></th>
|
||||
<th><%= t('personal_experience.organizationt_title') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span1"><%= t('personal_honor.year') %></th>
|
||||
<th><%= t('personal_honor.award_name') %></th>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span1"><%= t('personal_journal.year') %></th>
|
||||
<th><%= t('module_name.personal_journal') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span1"><%= t('personal_lab.year') %></th>
|
||||
<th><%= t('personal_lab.lab_title') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span2"><%= t('personal_patent.publication_date') %></th>
|
||||
<th><%= t('personal_patent.patent_title') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span2"><%= t('personal_project.period') %></th>
|
||||
<th><%= t('personal_project.project_title') %></th>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" /></th>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<% end -%>
|
||||
<th class="span2"><%= t('personal_research.publication_date') %></th>
|
||||
<th><%= t('personal_research.research_title') %></th>
|
||||
|
|
|
|||
|
|
@ -199,7 +199,6 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
@survey.survey_questions.all.each do |question|
|
||||
new_question = @new_survey.survey_questions.new
|
||||
question.attributes.each do |key, value|
|
||||
|
|
@ -211,32 +210,30 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
# question.survey_question_options.all.each do |option|
|
||||
# new_option = new_question.survey_question_options.new
|
||||
# option.attributes.each do |key, value|
|
||||
# unless ['_id', 'survey_question_id'].include? key
|
||||
# if option.respond_to?(key + '_translations')
|
||||
# new_option.name_translations = value
|
||||
# else
|
||||
# new_option.write_attribute(key, value)
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
|
||||
# question.survey_question_radiogroups.all.each do |radiogroup|
|
||||
# new_radiogroup = new_question.survey_question_radiogroups.new
|
||||
# radiogroup.attributes.each do |key, value|
|
||||
# unless ['_id', 'survey_question_id'].include? key
|
||||
# if radiogroup.respond_to?(key + '_translations')
|
||||
# new_option.name_translations = value
|
||||
# else
|
||||
# new_radiogroup.write_attribute(key, value)
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
question.survey_question_options.all.each do |option|
|
||||
new_option = new_question.survey_question_options.new
|
||||
option.attributes.each do |key, value|
|
||||
unless ['_id', 'survey_question_id'].include? key
|
||||
if option.respond_to?(key + '_translations')
|
||||
new_option.send(key + '_translations=', value)
|
||||
else
|
||||
new_option.write_attribute(key, value)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
question.survey_question_radiogroups.all.each do |radiogroup|
|
||||
new_radiogroup = new_question.survey_question_radiogroups.new
|
||||
radiogroup.attributes.each do |key, value|
|
||||
unless ['_id', 'survey_question_id'].include? key
|
||||
if radiogroup.respond_to?(key + '_translations')
|
||||
new_radiogroup.send(key + '_translations=', value)
|
||||
else
|
||||
new_radiogroup.write_attribute(key, value)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@new_survey.create_user_id = current_user.id
|
||||
|
|
|
|||
Reference in New Issue