Skip to content

会員管理・会員検索の開発に伴う改修 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Dec 18, 2015
Merged

会員管理・会員検索の開発に伴う改修 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b4caa3e
UserAttributeSettingsテーブルのフィールド名修正
s-nakajima Dec 4, 2015
0986822
staticをやめる
s-nakajima Dec 4, 2015
cbac203
会員検索の改修による修正
s-nakajima Dec 6, 2015
89c7a11
phpcsエラー
s-nakajima Dec 6, 2015
500011b
会員検索の改修による修正
s-nakajima Dec 6, 2015
b3b6df5
prepare()を各メソッドに移動
s-nakajima Dec 7, 2015
e70f0ee
phpdoc修正
s-nakajima Dec 7, 2015
c68455d
Notice発生したため修正
s-nakajima Dec 7, 2015
c0b8bef
ルーム内の役割と会員の情報の切り分けがわかるように線を入れるように修正したことによる改修
s-nakajima Dec 9, 2015
8250a8b
前回ログイン日時処理を追加するとともに、User側に処理移動。
s-nakajima Dec 11, 2015
a90e35e
アバターの自動生成処理組み込み。（コメント中）
s-nakajima Dec 11, 2015
dfa6f5f
アバターの自動生成処理組み込み
s-nakajima Dec 12, 2015
de9df77
アバターの自動生成処理組み込み
s-nakajima Dec 12, 2015
3652aae
アバターの自動生成処理組み込み
s-nakajima Dec 12, 2015
4d22ecf
アバターの自動生成処理
s-nakajima Dec 12, 2015
d5cef4b
前回ログイン処理の追加
s-nakajima Dec 12, 2015
e68d318
「会員管理者以外の読み書きを禁ずる」を「本人も読めない」「本人も書けない」に分割する
s-nakajima Dec 14, 2015
0503682
会員選択ダイアログで、会員検索した時にページ遷移ではなく、エラーとする
s-nakajima Dec 15, 2015
15b50b4
アバターの自動生成処理修正
s-nakajima Dec 16, 2015
f704164
会員選択のエラーメッセージ修正
s-nakajima Dec 16, 2015
147099c
fixuterの修正
s-nakajima Dec 16, 2015
216826d
phpmdエラー修正
s-nakajima Dec 16, 2015
37c301b
サイト管理者で一覧表示すると、システム管理者のハンドルが表示されない＋不要引数削除
s-nakajima Dec 17, 2015
9cd0253
複数あるMigrationファイルを一つにする
s-nakajima Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions Config/Migration/1434983278_init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,43 @@ class Init extends CakeMigration {
public $migration = array(
'up' => array(
'create_table' => array(
'user_select_counts' => array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
'select_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
'created_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
'modified_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
'indexes' => array(
'PRIMARY' => array('column' => 'id', 'unique' => 1),
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB'),
),
'users' => array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
'username' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'ID | ログインID'),
'password' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Password | パスワード'),
'key' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Link identifier | リンク識別子'),
'username' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'ID | ログインID', 'charset' => 'utf8'),
'password' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Password | パスワード', 'charset' => 'utf8'),
'key' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Link identifier | リンク識別子', 'charset' => 'utf8'),
'is_deleted' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'avatar' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Avatar | アバター'),
'avatar_file_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
'is_avatar_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'handlename' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Handle | ハンドル'),
'is_avatar_auto_created' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
'handlename' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Handle | ハンドル', 'charset' => 'utf8'),
'is_handlename_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_name_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'email' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'E-mail | eメール'),
'email' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'E-mail | eメール', 'charset' => 'utf8'),
'is_email_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'moblie_mail' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Mobile mail | 携帯メール'),
'is_email_reception' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'moblie_mail' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Mobile mail | 携帯メール', 'charset' => 'utf8'),
'is_moblie_mail_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'sex' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Sex | 性別'),
'is_moblie_mail_reception' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'sex' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Sex | 性別', 'charset' => 'utf8'),
'is_sex_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'timezone' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'TimeZone | タイムゾーン'),
'timezone' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'TimeZone | タイムゾーン', 'charset' => 'utf8'),
'is_timezone_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'role_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Authority | 権限'),
'role_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Authority | 権限', 'charset' => 'utf8'),
'is_role_key_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'status' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Status | 状態'),
'status' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Status | 状態', 'charset' => 'utf8'),
'is_status_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'Created | 作成日時'),
'is_created_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
Expand All @@ -66,6 +80,8 @@ class Init extends CakeMigration {
'is_password_modified_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'last_login' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'Last login | 最終ログイン日時'),
'is_last_login_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'previous_login' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'PreLast login | 前回ログイン日時'),
'is_previous_login_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_profile_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_search_keywords_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'indexes' => array(
Expand All @@ -77,9 +93,9 @@ class Init extends CakeMigration {
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
'language_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 6, 'unsigned' => false),
'name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Name | 氏名'),
'profile' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Profile | プロフィール'),
'search_keywords' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'comment' => 'Keywords | 検索キーワード'),
'name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Name | 氏名', 'charset' => 'utf8'),
'profile' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Profile | プロフィール', 'charset' => 'utf8'),
'search_keywords' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Keywords | 検索キーワード', 'charset' => 'utf8'),
'indexes' => array(
'PRIMARY' => array('column' => 'id', 'unique' => 1),
),
Expand All @@ -89,7 +105,7 @@ class Init extends CakeMigration {
),
'down' => array(
'drop_table' => array(
'users', 'users_languages'
'user_select_counts', 'users', 'users_languages'
),
),
);
Expand Down
67 changes: 0 additions & 67 deletions Config/Migration/1447929761_delete_avatar.php
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions Config/Migration/1448003986_add_mail_reception.php
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions Config/Migration/1448811617_add_user_select_counts.php
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Config/Schema/schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public function after($event = array()) {
'key' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Link identifier | リンク識別子', 'charset' => 'utf8'),
'is_deleted' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_avatar_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_avatar_auto_created' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
'handlename' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'Handle | ハンドル', 'charset' => 'utf8'),
'is_handlename_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_name_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
Expand Down Expand Up @@ -105,6 +106,8 @@ public function after($event = array()) {
'is_password_modified_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'last_login' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'Last login | 最終ログイン日時'),
'is_last_login_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'previous_login' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => 'PreLast login | 前回ログイン日時'),
'is_previous_login_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_profile_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'is_search_keywords_public' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
'indexes' => array(
Expand Down
3 changes: 2 additions & 1 deletion Console/Command/Task/ImportTask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class ImportTask extends AppShell {
* @return void
*/
public function execute() {
Security::setHash('sha512');

$file = Hash::get($this->args, '0');
if (! $file) {
$this->args[0] = $this->in(__d('users', 'Enter import file path.'));
Expand All @@ -51,7 +53,6 @@ public function execute() {
$user = $this->User->findById(1);
CakeSession::write(AuthComponent::$sessionKey, $user['User']);
Current::initialize(new CakeRequest());
$this->User->prepare();

if (! $this->User->importUsers($file)) {
//バリデーションエラーの場合
Expand Down
Loading