Changeset 18692


Ignore:
Timestamp:
2010/06/11 15:13:17 (12 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100610085805-owjdbyxdezivzuuk
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-20100611061313-qkrn3w1o0pweegaj
bzr:revno:
2236
bzr:revprop:branch-nick:
branches/comu-ver2
bzr:root:
branches/comu-ver2
bzr:text-parents:

data/Smarty/templates/default/admin/mail/template.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18254
data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18234
bzr:timestamp:
2010-06-11 15:13:13.943000078 +0900
bzr:user-agent:
bzr2.1.1+bzr-svn1.0.2
svn:original-date:
2010-06-11T06:13:13.943000Z
Message:

merged r18691

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

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/Smarty/templates/default/admin/mail/template.tpl

    r18254 r18692  
    3636    <!--{section name=data loop=$list_data}--> 
    3737    <tr> 
    38       <td><!--{$list_data[data].disp_date|escape}--></td> 
     38      <td><!--{$list_data[data].disp_date|escape|date_format:'%Y/%m/%d'}--></td> 
    3939      <td class="left"><!--{$list_data[data].subject|escape}--></td> 
    4040      <!--{assign var=type value=$list_data[data].mail_method|escape}--> 
  • branches/comu-ver2/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php

    r18234 r18692  
    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.