chiu
/
personal_plugin_generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug.

This commit is contained in:
BoHung Chiu 2022-07-27 13:52:42 +08:00
parent 919bb6eca3
commit 5f24254ae3
25 changed files with 1048 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/controllers/admin/personal_plugin_fields_controller.rb
View File

@ -611,21 +611,53 @@ class Admin::PersonalPluginFieldsController < OrbitMemberController
break
end
end
new_text = new_text.gsub(/parse_again_start((?:(?!parse_again_start).)+)parse_again_end/m) do |ff|
parse_content = $1 #last match
new_text = new_text.gsub(/[ \t]*parse_again_start((?:(?!parse_again_start).)+)parse_again_end[ \t]*(\r\n|\n)/m) do |ff|
@parse_again_mode = true
parse_content = $1 #parse_again block contents
result = ff
if include_key($1,k)
start_index = 0
end_index = parse_content.length
start_index = 2 if parse_content[0..1] == "\r\n"
end_index = end_index - 2 if parse_content[(end_index - 2)..(end_index - 1)] == "\r\n"
parse_content = parse_content.slice(start_index,end_index)
match_count = parse_content.match(/^ *\* *\d+/m)
match_count = match_count ? match_count[0] : nil
exist_condition = parse_content.split("\n")[0].match(/if[ ]+#{::Regexp.escape(k)}(?=\.| |$)/)
extra_cond = nil
if exist_condition
exist_condition = exist_condition[0]
parse_content = parse_content[ parse_content.index(exist_condition) + exist_condition.length..-1]
extra_cond = parse_content.match(/^\.count *(\!|\<|\>|\=)(\=|) *\d+/)
if extra_cond
extra_cond = extra_cond[0]
exist_condition += extra_cond
parse_content = parse_content[extra_cond.length..-1]
exist_condition = eval("vv"+extra_cond) ? exist_condition : nil
elsif vv.count == 0
exist_condition = nil
end
if exist_condition.nil?
match_count = nil
parse_content = ""
result = ""
end
elsif match_count
parse_content = parse_content[match_count.length..-1]
end
parse_content = parse_content.sub(/[ \t]+\z/m, '').sub(/\A(\r\n|\n)/, '')
if include_key(parse_content,k)
vv_count = vv.count
if match_count
vv_count = [vv_count, match_count.strip[1..-1].to_i].min
end
if inner
result = (0...vv.count).map {|ii| replace_text_with_pattern(parse_content,false,i,ii,true) }.join("")
result = (0...vv_count).map {|ii| replace_text_with_pattern(parse_content,false,i,ii,true) }.join("")
else
result = (0...vv.count).map {|ii| replace_text_with_pattern(parse_content,false,ii) }.join("")
result = (0...vv_count).map {|ii| replace_text_with_pattern(parse_content,false,ii) }.join("")
end
elsif match_count || exist_condition
count = 1
if match_count
count = match_count.strip[1..-1].to_i
end
result = (0...count).map {|ii| parse_content }.join("")
end
@parse_again_mode = false
result
end
end
@ -637,7 +669,9 @@ class Admin::PersonalPluginFieldsController < OrbitMemberController
end
def gsub_text_by_key_value(text,k,v)
@blank_texts = []
text.gsub(/\n(\s*)[^\n]*(#{k}|#{k.classify})/m) {|ff| @blank_texts << $1.gsub(/(\r\n|\n)/,'')}
if !@parse_again_mode
text.gsub(/\n(\s+)[^\n]*(#{k}|#{k.classify})/m) {|ff| @blank_texts << $1.gsub(/(\r\n|\n)/,'')}
end
i = 0
text = text.gsub(k + "s"){|ff| v.pluralize.gsub("\n","\n#{@blank_texts[i]}")}
text = text.gsub(k ){|ff| v.gsub("\n","\n#{@blank_texts[i]}")}

10
app/views/admin/personal_plugin_fields/_form.html.erb
View File

@ -95,7 +95,7 @@
<div class="controls">
<% f.object.related_modal_name.each_with_index do |related_modal_name,i| %>
<div>
<%= text_field_tag "#{f.object_name}[related_modal_name][]", related_modal_name,placeholder: thead_field("related_modal_name"), class: "related_modal_name" %>
<%= text_field_tag "#{f.object_name}[related_modal_name][]", related_modal_name,placeholder: thead_field("related_modal_name"), class: "related_modal_name", title: thead_field("related_modal_name") %>
<button type="button" class="remove_related_modal" index="<%=i%>"><%=t(:remove)%></button>
</div>
<% end %>
@ -162,7 +162,7 @@
$(this).parents('.start-line').hide();
}
});
var related_modal_name_html = '<%= text_field_tag "#{f.object_name}[related_modal_name][]", '',placeholder: thead_field("related_modal_name"), class: "related_modal_name" %>';
var related_modal_name_html = '<%= text_field_tag "#{f.object_name}[related_modal_name][]", '',placeholder: thead_field("related_modal_name"), class: "related_modal_name", title: thead_field("related_modal_name") %>';
related_modal_name_html = $("<div></div>").append(related_modal_name_html);
related_modal_name_html.append("<button type=\"button\" class=\"remove_related_modal\"><%=t(:remove) %></button>")
$(".remove_btn").off("click").on("click",function(){
@ -276,7 +276,11 @@
$('tr >:last-child').css( 'border','');
}
})
$(document).on('blur', 'input.related_modal_name', function(){
var _this = $(this);
var idx = _this.index('input.related_modal_name');
$('span.related_modal_name').eq(idx).text(_this.val());
})
</script>
<style type="text/css">
.module-area .control-group {

6
app/views/admin/personal_plugin_fields/_render_fields_check_table.html.erb
View File

@ -11,20 +11,20 @@
<% ii = -1 %>
<% object.primary_modal_fields.each do |field_value| %>
<% next if (!access_field_types.include?(field_value[:field_type]) rescue false) %>
<% content = check_box_tag("#{f.object_name}[]", field_value[:field_name] , (object.send(root_name)[page_name].include?(field_value[:field_name]) rescue false),:id=>nil,:class=>"#{page_name}_fields") %>
<% content = check_box_tag("#{f.object_name}[#{root_name}][#{page_name}][]", field_value[:field_name] , (object.send(root_name)[page_name].include?(field_value[:field_name]) rescue false),:id=>nil,:class=>"#{page_name}_fields") %>
<% tds << "<td data-index=\"#{ii+=1}\">#{field_value[:translation_name][I18n.locale] rescue ""}-#{field_value[:field_name]}<hr class=\"border-hr\">#{content}</td>" %>
<% end %>
<% if !defined?(access_field_types) %>
<% f.object.related_modal_name.each_with_index do |related_modal_name,i| %>
<% field_values = f.object.related_modal_fields[i].to_a %>
<% field_values.each do |field_value| %>
<% content = check_box_tag("#{f.object_name}[]", "#{related_modal_name+'.'+field_value[:field_name]}" , (object.send(root_name)[page_name].include?(related_modal_name+'.'+field_value[:field_name]) rescue false),:id=>nil,:class=>"#{page_name}_fields") %>
<% content = check_box_tag("#{f.object_name}[#{root_name}][#{page_name}][]", "#{related_modal_name+'.'+field_value[:field_name]}" , (object.send(root_name)[page_name].include?(related_modal_name+'.'+field_value[:field_name]) rescue false),:id=>nil,:class=>"#{page_name}_fields") %>
<% tds << "<td data-index=\"#{ii+=1}\">#{related_modal_name}-#{field_value[:translation_name][I18n.locale] rescue ""}-#{field_value[:field_name]}<hr class=\"border-hr\">#{content}</td>" %>
<% end %>
<% end %>
<% author_name_translation = @personal_plugin_field.author_name_translations[locale] rescue ""
author_name_translation = I18n.t("personal_plugins.author") if author_name_translation.blank? %>
<% content = check_box_tag("#{f.object_name}[]", "member_profile" , (object.send(root_name)[page_name].include?("member_profile") rescue false),:id=>nil) %>
<% content = check_box_tag("#{f.object_name}[#{root_name}][#{page_name}][]", "member_profile" , (object.send(root_name)[page_name].include?("member_profile") rescue false),:id=>nil) %>
<% tds << "<td data-index=\"#{ii+=1}\">#{author_name_translation}<hr class=\"border-hr\">#{content}</td>" %>
<% end %>
<% fields_order = (0...tds.count).to_a

22
template_generator/app/models/plugin_template.rb
View File

@ -5,7 +5,6 @@ class PluginTemplate
include MemberHelper
include Slug
col_fields
plugin_template_related_files_fields
@ -16,7 +15,7 @@ parse_again_end
field :rss2_id
belongs_to :member_profile
index(plugin_template_sort_hash, { unique: false, background: false })
scope :sort_hash, ->{ order_by(plugin_template_sort_hash) }
scope :sort_for_frontend, ->{ where(:is_hidden=>false).order_by(plugin_template_sort_hash) }
@ -57,23 +56,29 @@ parse_again_end
fields_to_show = fields_to_show - fields_to_remove
plugin_datas = datas.sort_for_frontend.collect.with_index do |p,index|
plugin_datas = datas.sort_for_frontend.collect.with_index do |p,idx|
pd_data = []
fields_to_show.collect do |t|
pd_data << { "data_title" => p.display_field(t) }
end
parse_again_start * 1 if plugin_template_related.count > 0
{
"pd_datas" => pd_data,
"type-sort" => (p.course_category.sort_position.to_i rescue 1000),
"sort-index" => index
"type-sort" => (p.plugin_template_related.sort_position.to_i rescue 1000),
"sort-index" => idx
}
parse_again_end
parse_again_start * 1 if plugin_template_related.count == 0
{
"pd_datas" => pd_data
}
parse_again_end
end
parse_again_start * 1 if plugin_template_related.count > 0
plugin_datas = plugin_datas.sort_by{|pd| [pd["type-sort"], pd["sort-index"]]}
parse_again_end
return [pd_title,plugin_datas]
end
def get_plugin_data(fields_to_show)
@ -105,5 +110,4 @@ parse_again_end
plugin_template = self
display_field_code
end
end

1
template_generator/app/models/plugin_template_intro.rb
View File

@ -1,4 +1,3 @@
class PluginTemplateIntro < PersonalPluginIntro
end

1
template_generator/app/models/plugin_template_link.rb
View File

@ -21,5 +21,4 @@ class PluginTemplateLink
self.url = 'http://' + self.url
end
end
end

1
template_generator/app/models/plugin_template_related.rb
View File

@ -3,6 +3,7 @@ class PluginTemplateRelated
include Mongoid::Timestamps
col_related_fields
field :sort_position, type: Integer, default: 0
has_many :plugin_templates
parse_again_start

4
template_generator/app/views/admin/plugin_templates/_plugin_template_related.html.erb
View File

@ -13,7 +13,9 @@ parse_again_start
<td>related_backend_index_fields_contents</td>
parse_again_end
<td class="span2">
<a href="<%= edit_admin_plugin_template_related_path(plugin_template_related) %>#plugin_template_related_modal" data-toggle="modal" data-remote="true" class="action"><%= t(:edit) %></a>
<a href="<%= edit_admin_plugin_template_related_path(plugin_template_related) %>#plugin_template_related_modal" data-toggle="modal" data-remote="true" class="action">
<%= t(:edit) %>
</a>
<%= link_to t(:delete_), admin_plugin_template_related_path(plugin_template_related), "data-confirm" => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
</td>
</tr>

7
template_generator/app/views/admin/plugin_templates/analysis.html.erb
View File

@ -84,8 +84,7 @@ parse_again_end
form.form.on("submit",function(){return false;})
$("#generate_excel").on("click",function(){
window.location.href = "/admin/plugin_templates/download_excel.xlsx?" + "analysis_field_name_start=" + form.form.find("[name=analysis_field_name_start]").val() + "&analysis_field_name_end=" + form.form.find("[name=analysis_field_name_end]").val() + "&time_zone=" +
time_zone_string;
window.location.href = "/admin/plugin_templates/download_excel.xlsx?" + "analysis_field_name_start=" + form.form.find("[name=analysis_field_name_start]").val() + "&analysis_field_name_end=" + form.form.find("[name=analysis_field_name_end]").val() + "&time_zone=" + time_zone_string;
return false;
})
@ -117,7 +116,3 @@ parse_again_end
})
}
</script>

12
template_generator/app/views/admin/plugin_templates/frontend_setting.html.erb
View File

@ -53,11 +53,8 @@
<!-- Language -->
<div class="tab-content language-area">
<% @site_in_use_locales.each_with_index do |locale, i| %>
<div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
<!-- Content -->
<div class="control-group input-content">
<label class="control-label muted"><%= t(:content) %></label>
@ -69,18 +66,9 @@
</div>
</div>
</div>
</div>
<% end %>
</div>
</div>
<!-- Form Actions -->

2
template_generator/app/views/admin/plugin_templates/index.html.erb
View File

@ -14,7 +14,9 @@
<div class="bottomnav clearfix">
<div class="action pull-right">
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:new_), new_admin_plugin_template_path, :class => 'btn btn-primary' %>
parse_again_start * 1 if plugin_template_related.count == 0
<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), admin_plugin_template_setting_path, :class => 'btn btn-primary pull-right' %>
parse_again_end
</div>
<div class="pagination pagination-centered">
<%= content_tag :div, paginate(@plugin_templates), class: "pagination pagination-centered" %>