bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge heihedata branch r4203 to r4215 to trunk

This commit is contained in:
wlx 2014-02-17 03:27:54 +00:00
parent f6a719ad1b
commit ab930d5ef5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controllers/DownController.php
View File

@ -1375,7 +1375,7 @@ class Admin_DownController extends Zend_Controller_Action
$sql = "select distinct u.email
from dataorder d
LEFT JOIN users u on d.userid = u.id
WHERE u.email IS NOT NULL
WHERE u.email IS NOT NULL and d.status in (0,5) and d.ts_approved is not null
AND d.uuid=?
GROUP BY u.email";

14
application/default/views/scripts/hiwater/list.phtml
View File

@ -5,16 +5,16 @@ $this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/water.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
$this->breadcrumb('<a href="/hiwater/">'.$this->config->title->hiwater.'</a>');
$this->breadcrumb('数据列表');
$this->breadcrumb()->setSeparator(' > ');
$this->theme->AppendPlus($this,'colorbox');
?>
<div class="row">
<div class="span2">
<div class="span3">
<?= $this->partial('hiwater/navi.phtml'); ?>
</div>
<div class="span10">
<div class="span9">
<div><?= $this->breadcrumb() ?> </div>
<div id="intro"></div>
<?php if ($this->metadata) : ?>
@ -22,12 +22,12 @@ $this->theme->AppendPlus($this,'colorbox');
<ol class="md-list">
<?php foreach($this->metadata as $md) : ?>
<li>
<a href="/heihe/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a>
<a href="/hiwater/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a>
<span class="pull-right">
[<a class="colorbox" href="/service/bigthumb/uuid/<?php echo $md['uuid']; ?>" title="<?php echo $md['title']; ?>"><i class="icon-facetime-video"></i>缩略图幻灯片</a>]
[<a href="/service/pdf/review/1/uuid/<?php echo $md['uuid']; ?>"><i class="icon-file"></i>PDF版本下载</a>]
[<a href="/service/odt/review/1/uuid/<?php echo $md['uuid']; ?>"><i class="icon-book"></i>ODT版本下载</a>]
[<a href="/service/doc/review/1/uuid/<?php echo $md['uuid']; ?>"><i class="icon-list-alt"></i>DOC版本下载</a>]
[<a href="/service/pdf/uuid/<?php echo $md['uuid']; ?>"><i class="icon-file"></i>PDF版本下载</a>]
[<a href="/service/odt/uuid/<?php echo $md['uuid']; ?>"><i class="icon-book"></i>ODT版本下载</a>]
[<a href="/service/doc/uuid/<?php echo $md['uuid']; ?>"><i class="icon-list-alt"></i>DOC版本下载</a>]
</span>
</li>
<?php endforeach; ?>

2
application/module/Files/Files.php
View File

@ -151,7 +151,7 @@ class Files{
$msg['file_url'] = $file_url;
$msg['file_size'] = $file_size;
$msg['db_path'] = $this->config->upload . $dbsave;
$msg['db_path'] = $dbsave;
$msg['realname'] = $file_name;
$msg['file_ext'] = $file_ext;
$msg['file_mime'] = $this->getFileMime($file_path);