fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/2381

Browse source
This commit is contained in:
Kijin Sung 2024-07-21 20:34:51 +09:00
commit 111cd393f0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/addon/addon.admin.model.php
View file

@ -398,10 +398,10 @@ class addonAdminModel extends addon
} }
$obj->options = array(); $obj->options = array();
for($i = 0, $c = count($val->options); $i < $c; $i++) foreach ($val->options ?? [] as $i => $option)
{ {
$obj->options[$i]->title = $val->options[$i]->title->body; $obj->options[$i]->title = $option->title->body;
$obj->options[$i]->value = $val->options[$i]->value->body; $obj->options[$i]->value = $option->value->body;
} }
$addon_info->extra_vars[] = $obj; $addon_info->extra_vars[] = $obj;
} }

8
modules/addon/tpl/setup_addon.html
View file

@ -100,16 +100,16 @@
<label class="x_control-label">{$lang->target}</label> <label class="x_control-label">{$lang->target}</label>
<div class="x_controls"> <div class="x_controls">
<label for="check_all"><input type="checkbox" id="check_all" /> Check all</label> <label for="check_all"><input type="checkbox" id="check_all" /> Check all</label>
<block loop="$mid_list => $module_category_srl, $modules"> <block loop="$mid_list => $module_category_srl, $modules">
<!--@if(count($mid_list) > 1)--> <!--@if(is_array($mid_list) && count($mid_list) > 1)-->
<fieldset> <fieldset>
<legend><!--@if($modules->title)-->{$modules->title}<!--@else-->{$lang->none_category}<!--@end--></legend> <legend><!--@if($modules->title)-->{$modules->title}<!--@else-->{$lang->none_category}<!--@end--></legend>
<!--@end--> <!--@end-->
<label loop="$modules->list => $key, $val"> <label loop="$modules->list => $key, $val">
<input type="checkbox" value="{$key}" name="mid_list[]" id="chk_mid_list_{$key}" checked="checked"|cond="in_array($key, $addon_info->mid_list)"/> <input type="checkbox" value="{$key}" name="mid_list[]" id="chk_mid_list_{$key}" checked="checked"|cond="in_array($key, $addon_info->mid_list ?? [])"/>
{$key} ({$val->browser_title}) {$key} ({$val->browser_title})
</label> </label>
<!--@if(count($mid_list) > 1)--> <!--@if(is_array($mid_list) && count($mid_list) > 1)-->
</fieldset> </fieldset>
<!--@end--> <!--@end-->
</block> </block>