fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 160, don`t display "delete" link when not set ftp info

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9299 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-23 04:43:16 +00:00
parent b55fa847ea
commit da7e0c0b2a
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/autoinstall/autoinstall.model.php
View file

@ -205,6 +205,9 @@
function getRemoveUrlByPackageSrl($packageSrl)
{
$ftp_info = Context::getFTPInfo();
if (!$ftp_info->ftp_root_path) return;
if (!$packageSrl) return;
return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl);
@ -214,6 +217,9 @@
{
if (!$path) return;
$ftp_info = Context::getFTPInfo();
if (!$ftp_info->ftp_root_path) return;
$packageSrl = $this->getPackageSrlByPath($path);
if (!$packageSrl) return;

14
modules/autoinstall/lang/lang.xml
View file

@ -254,26 +254,26 @@
</item>
<item name="msg_ftp_invalid_auth_info">
<value xml:lang="ko"><![CDATA[FTP 인증 정보가 올바르지 않습니다.]]></value>
<value xml:lang="ko"><![CDATA[FTP authentication information is incorrect.]]></value>
<value xml:lang="en"><![CDATA[FTP authentication information is incorrect.]]></value>
</item>
<item name="msg_ftp_password_input">
<value xml:lang="ko"><![CDATA[FTP 비밀번호를 입력하세요.]]></value>
<value xml:lang="ko"><![CDATA[Enter your FTP password.]]></value>
<value xml:lang="en"><![CDATA[Enter your FTP password.]]></value>
</item>
<item name="msg_ftp_not_connected">
<value xml:lang="ko"><![CDATA[FTP 접속 실패]]></value>
<value xml:lang="ko"><![CDATA[FTP connection failed]]></value>
<value xml:lang="en"><![CDATA[FTP connection failed]]></value>
</item>
<item name="msg_make_directory_failed">
<value xml:lang="ko"><![CDATA[디렉터리 생성 실패]]></value>
<value xml:lang="ko"><![CDATA[Failed to create directory]]></value>
<value xml:lang="en"><![CDATA[Failed to create directory]]></value>
</item>
<item name="msg_permission_adjust_failed">
<value xml:lang="ko"><![CDATA[퍼미션 변경 실패]]></value>
<value xml:lang="ko"><![CDATA[Failure to change the permissions]]></value>
<value xml:lang="en"><![CDATA[Failure to change the permissions]]></value>
</item>
<item name="msg_ftp_upload_failed">
<value xml:lang="ko"><![CDATA[FTP 파일 업로드 실패]]></value>
<value xml:lang="ko"><![CDATA[FTP file upload fails]]></value>
<value xml:lang="en"><![CDATA[FTP file upload fails]]></value>
</item>
</lang>
</lang>

2
modules/autoinstall/tpl/list.html
View file

@ -68,7 +68,7 @@
<td>{htmlspecialchars($item->current_version)}</td>
<td>
<a cond="!$item->current_version" href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$item->package_srl)}">{$lang->install}</a>
<a cond="$item->current_version && $item->avail_remove" href="{getUrl('act','dispAutoinstallAdminUninstall','package_srl',$item->package_srl)}">{$lang->cmd_delete}</a>
<a cond="!$show_ftp_note && $item->current_version && $item->avail_remove" href="{getUrl('act','dispAutoinstallAdminUninstall','package_srl',$item->package_srl)}">{$lang->cmd_delete}</a>
<a cond="$item->current_version && $item->need_update == 'Y'" href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$item->package_srl)}">{$lang->update}</a>
</td>
</tr>