maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- show aps-databases also customer-mysql overview, fixes #272

Browse Source 
- aps-databases are now increasing the customers mysql-contingent, refs #278
- customers viewing the aps-list are now notified if a package requires a database but the contingent is used up
- the update will add all web[X]aps[Y] databases to the according customer regardless of contingent
- fix tiny issue in preconfig
- setting version to 0.9.10-svn2


refs #272,278
This commit is contained in:
Michael Kaufmann (d00p)
2010-06-17 09:21:14 +00:00
parent 794c4d3b55
commit 9851ac53cc
12 changed files with 133 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/customer/aps/package.tpl
View File

@@ -29,7 +29,7 @@
<input class="bottom" type="submit" value="{$lng['aps']['back']}" />
</form>
</if>
<if $action != 'customerstatus' && ( $userinfo['aps_packages'] != $userinfo['aps_packages_used'] )>
<if $action != 'customerstatus' && ( $userinfo['aps_packages'] != $userinfo['aps_packages_used'] ) && $db_info == ''>
<form method="get" action="$filename" style="float:left; padding-left: 5px;">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
@@ -38,6 +38,9 @@
<input class="bottom" type="submit" value="{$lng['aps']['install']}" />
</form>
</if>
<if $db_info != ''>
<span style="padding-left: 5px;">{$db_info}</span>
</if>
<if ($action == 'customerstatus') && ($Row['Status'] == 2 || $Row['Status'] == 3)>
<form method="get" action="$filename" style="float:left;">
<input type="hidden" name="s" value="$s" />

8
templates/customer/mysql/mysqls_database.tpl
View File

@@ -2,6 +2,10 @@
<td class="field_name_border_left">{$row['databasename']}</td>
<td class="field_name">{$row['description']}</td>
<if 1 < count($sql_root)><td class="field_name">{$sql_root[$row['dbserver']]['caption']}</td></if>
<td class="field_name"><a href="$filename?page=mysqls&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
<td class="field_name"><a href="$filename?page=mysqls&amp;action=delete&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['delete']}</a></td>
<if $row['apsdb'] != '1'>
<td class="field_name"><a href="$filename?page=mysqls&amp;action=edit&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['edit']}</a></td>
<td class="field_name"><a href="$filename?page=mysqls&amp;action=delete&amp;id={$row['id']}&amp;s=$s">{$lng['panel']['delete']}</a></td>
<else>
<td class="field_name" colspan="2">{$lng['aps']['cannoteditordeleteapsdb']}</td>
</if>
</tr>