Changeset 18724 for branches/version-2_4


Ignore:
Timestamp:
2010/06/21 17:31:53 (14 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100621082657-lennw20lq2fj75u1
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/default/admin/mail/template.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Ftemplate.tpl
data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 15646@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_Template.php
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100621083150-0qmc1whwvjzjatcw
bzr:revno:
1931
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/Smarty/templates/default/admin/mail/template.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16582
data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2:17204
bzr:timestamp:
2010-06-21 17:31:50.957999945 +0900
bzr:user-agent:
bzr2.1.1+bzr-svn1.0.2
svn:original-date:
2010-06-21T08:31:50.958000Z
Message:

merged r18691

  • メルマガ管理のテンプレート設定で空行が表示されるのを修正(#765)
Location:
branches/version-2_4/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/Smarty/templates/default/admin/mail/template.tpl

    r16582 r18724  
    7373                                    <!--{section name=data loop=$list_data}--> 
    7474                                    <tr bgcolor="#ffffff" class="fs12n"> 
    75                                         <td width="120" align="center"><!--{$list_data[data].disp_date|escape}--></td> 
     75                                        <td width="120" align="center"><!--{$list_data[data].disp_date|escape|date_format:'%Y/%m/%d'}--></td> 
    7676                                        <td width="333"><!--{$list_data[data].subject|escape}--></td> 
    7777                                        <!--{assign var=type value=$list_data[data].mail_method|escape}--> 
  • branches/version-2_4/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php

    r17204 r18724  
    8989        $sql = "SELECT *, create_date as disp_date FROM dtb_mailmaga_template WHERE del_flg = 0 ORDER BY create_date DESC"; 
    9090        $this->list_data = $conn->getAll($sql); 
    91         $this->list_data['disp_date'] = substr($this->list_data['disp_date'], 0, 19); 
    9291 
    9392        $objView->assignobj($this); 
Note: See TracChangeset for help on using the changeset viewer.