Systemの非公開でキャラクター非公開化

diff --git a/app/controllers/systems_controller.php b/app/controllers/systems_controller.php
index d72f454..2d13b7e 100644 (file)
--- a/app/controllers/systems_controller.php
+++ b/app/controllers/systems_controller.php
@@ -109,6 +109,11 @@ class SystemsController extends AppController {
 
                        if ($this->System->saveAll($this->data, array('fieldList' => array_merge($this->System->fields['edit'], $this->System->fields['image'])))) {
                                $this->Session->setFlash(sprintf(__('%s has been changed', true), $this->data['System']['name']));
+
+                               if ($this->data['System']['public_flag'] != 'public') {
+                                       $this->System->Character->updateAll(array('Character.public_flag' => "'private'"), array('Character.system_id' => $id));
+                               }
+
                                Cache::clear();
                                $this->redirect(array('action'=>'view', $id));
                        } else {

diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index cedb58d..2d37cf2 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -3,6 +3,7 @@ class UsersController extends ModuleController {
 
        var $name = 'Users';
        var $helpers = array(
+               'Select',
                'Time',
        );
 
@@ -397,6 +398,7 @@ class UsersController extends ModuleController {
                }
                $this->set('public_characters', $public_characters);
 
+               $this->set_public_flag4view();
        }
 
        function _listview() {

diff --git a/app/views/elements/character_picture_table.ctp b/app/views/elements/character_picture_table.ctp
index 323e044..68723b0 100644 (file)
--- a/app/views/elements/character_picture_table.ctp
+++ b/app/views/elements/character_picture_table.ctp
@@ -55,6 +55,11 @@ foreach ($characters as $character):
        echo $html->div('lastModified', $time->niceShort($character['Character']['modified'], array('format' => 'Y/m/d H:i')));
 ?>
 <?php endif; ?>
+<?php if (isset($viewPublic) && $viewPublic === true): ?>
+<?php
+       echo $html->div('publicFlag', $select->get_i18n_unpublic_flag($character['Character']['public_flag'], $public_flags));
+?>
+<?php endif; ?>
 </td>
 
 <?php

diff --git a/app/views/elements/home_right.ctp b/app/views/elements/home_right.ctp
index 1b5709c..8ad0741 100644 (file)
--- a/app/views/elements/home_right.ctp
+++ b/app/views/elements/home_right.ctp
@@ -11,6 +11,7 @@
                'id' => null,
                'isUser' => false,
                'isSystem' => true,
+               'viewPublic' => true,
                'more_url' => array(
                        'controller' => 'characters', 
                        'action' => 'index',

diff --git a/app/views/systems/admin_edit.ctp b/app/views/systems/admin_edit.ctp
index b38ea9c..7b2349b 100644 (file)
--- a/app/views/systems/admin_edit.ctp
+++ b/app/views/systems/admin_edit.ctp
@@ -40,7 +40,12 @@
                'label' => __('URL', true),
        ));
        echo $select->create_publicflag_select($public_flags, 'public_flag', array(
-               'label' => __('Public Flag', true)
+               'label' => __('Public Flag', true),
+               'after' => $html->tag(
+                       'div',
+                       __('If unpublic, the belonging characters will be also unpublic.', true),
+                       array('class' => 'notice')
+               ),
        ));
        echo $form->input('set_npc', array(
                'label' => __('Use NPC', true),