is_subsetting判断の追加

diff --git a/app/views/helpers/profiledisp.php b/app/views/helpers/profiledisp.php
index 393c101..712450f 100644 (file)
--- a/app/views/helpers/profiledisp.php
+++ b/app/views/helpers/profiledisp.php
@@ -149,12 +149,16 @@ class ProfiledispHelper extends Helper {
        function set_profile_type4view($profile)
        {
                $this->profile_type = array(
+                       'is_subsetting' => false,
                        'is_select' => false,
                        'is_checkbox' => false,
                        'is_table' => false,
                        'is_multi' => false,
                );
 
+               if ($profile['profile_type'] == 'select' || $profile['profile_type'] == 'm-select' || $profile['profile_type'] == 'checkbox' || $profile['profile_type'] == 'table') {
+                       $this->profile_type['is_subsetting'] = true;
+               }
                if ($profile['profile_type'] == 'select' || $profile['profile_type'] == 'm-select') {
                        $this->profile_type['is_select'] = true;
                }

diff --git a/app/views/profiles/admin_edit.ctp b/app/views/profiles/admin_edit.ctp
index 7cb9d29..cefe3bb 100644 (file)
--- a/app/views/profiles/admin_edit.ctp
+++ b/app/views/profiles/admin_edit.ctp
@@ -50,7 +50,7 @@
                        'label' => __('Profile Type', true),
                );
                $profiledisp->set_profile_type4view($this->data['Profile']);
-               if ($profiledisp->profile_type['is_select'] || $profiledisp->profile_type['is_checkbox'] || $profiledisp->profile_type['is_table']) {
+               if ($profiledisp->profile_type['is_subsetting']) {
                        $profile_type_select_options['after'] = $html->tag(
                                'div',
                                __('If change, Profile Selects/Table Settings will be deleted.', true),

diff --git a/app/views/systems/admin_view.ctp b/app/views/systems/admin_view.ctp
index c249101..a5bde93 100644 (file)
--- a/app/views/systems/admin_view.ctp
+++ b/app/views/systems/admin_view.ctp
@@ -98,10 +98,10 @@ foreach ($system['Profile'] as $profile):
        $profiledisp->set_profile_type4view($profile);
 ?>
 <tr class="<?php echo $class;?>">
-<td rowspan="<?php if ($profiledisp->profile_type['is_select'] || $profiledisp->profile_type['is_checkbox'] || $profiledisp->profile_type['is_table']): ?>4<?php else: ?>3<?php endif; ?>">
+<td rowspan="<?php if ($profiledisp->profile_type['is_subsetting']): ?>4<?php else: ?>3<?php endif; ?>">
        <?php echo $profile['id']; ?>
 </td>
-<td rowspan="<?php if ($profiledisp->profile_type['is_select'] || $profiledisp->profile_type['is_checkbox'] || $profiledisp->profile_type['is_table']): ?>4<?php else: ?>3<?php endif; ?>">
+<td rowspan="<?php if ($profiledisp->profile_type['is_subsetting']): ?>4<?php else: ?>3<?php endif; ?>">
        <?php echo $profile['sort_order']; ?>
 </td>
 
@@ -157,7 +157,7 @@ foreach ($system['Profile'] as $profile):
        <?php echo $select->get_i18n_public_flag($profile['public_flag_default'], $public_flags); ?>
 </td>
 </tr>
-<?php if ($profiledisp->profile_type['is_select'] || $profiledisp->profile_type['is_checkbox'] || $profiledisp->profile_type['is_table']): ?> 
+<?php if ($profiledisp->profile_type['is_subsetting']): ?> 
 <tr>
 <td colspan="6">
 <?php