Changeset 19958 for branches/version-2_5-dev/data/class

Timestamp:

2011/01/18 18:13:37 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19957

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/mail/history.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Fhistory.tpl
data/Smarty/templates/admin/mail/query.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Fquery.tpl
data/Smarty/templates/admin/mail/template_complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Ftemplate_complete.tpl
data/Smarty/templates/admin/mail/template_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Ftemplate_input.tpl
data/class/pages/admin/mail/LC_Page_Admin_Mail.php 15640@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail.php
data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php 15649@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_TemplateInput.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2687

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/mail/history.tpl [email protected]
data/Smarty/templates/admin/mail/query.tpl [email protected]
data/Smarty/templates/admin/mail/template_complete.tpl [email protected]
data/Smarty/templates/admin/mail/template_input.tpl [email protected]
data/class/pages/admin/mail/LC_Page_Admin_Mail.php [email protected]
data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php [email protected]
html/install/index.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/drop_table.sql [email protected]

bzr:timestamp:

2011-01-18 18:13:23.717999935 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-18T09:13:23.718000Z

Message:

#793(非推奨機能の削除)

• 動作を優先するため, r18786 の一部を差し戻し

#382(管理画面XHTMLに変更)

• メルマガ管理画面を修正

Location:

branches/version-2_5-dev/data/class/pages/admin/mail

Files:

• LC_Page_Admin_Mail.php (modified) (1 diff)
• LC_Page_Admin_Mail_TemplateInput.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -210 +210 @@
 
             $this->list_data = $list_data;
+            $this->setTemplate('mail/query.tpl');
             return;
         }

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php

@@ -142 +142 @@
         } else {
             $sqlval['create_date'] = "now()";
+            $sqlval['template_id'] = $objQuery->nextVal('dtb_mailmaga_template_template_id');
             $objQuery->insert("dtb_mailmaga_template", $sqlval);
         }