Fixed: FS#2703 - System -> Apps & Addons -> Updates: no functionality FS#27...

tbrehm

2013-02-25 0a53fac89dd01b7c24111bf8b6d917cb1a2062eb

Fixed: FS#2703 - System -> Apps & Addons -> Updates: no functionality
FS#2700 - Delete Addon Package: Invalid ID

 interface/web/admin/lib/lang/en_software_package_list.lng

@@ -7,4 +7,5 @@
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
$wb['no_packages_txt'] = 'No packages available';
?>

 interface/web/admin/lib/lang/en_software_update_list.lng

@@ -5,4 +5,5 @@
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
$wb['no_updates_txt'] = 'No updates available';
?>

 interface/web/admin/software_package_list.php

@@ -146,7 +146,7 @@

$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
$packages = $app->db->queryAllRecords('SELECT * FROM software_package');
if(is_array($packages)) {
if(is_array($packages) && count($packages) > 0) {
    foreach($packages as $key => $p) {
        $installed_txt = '';
        foreach($servers as $s) {
@@ -169,9 +169,12 @@
                }
            }
        }
        $packages[$key]['software_update_inst_id'] = $inst['software_update_inst_id'];
        $packages[$key]['software_update_inst_id'] = intval($inst['software_update_inst_id']);
        $packages[$key]['installed'] = $installed_txt;
    }
    $app->tpl->setVar('has_packages',1);
} else {
    $app->tpl->setVar('has_packages',0);
}



 interface/web/admin/templates/software_package_list.htm

@@ -26,20 +26,22 @@
                    </tr>
                </thead>
                <tbody>
                    <tmpl_loop name="records">
                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                    <tmpl_loop name="records">
                        <tmpl_if name="has_packages">
                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
                            <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
                            <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
                            <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
                            <td class="tbl_col_buttons">
                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
                            </td>
                        </tr>
                        </tmpl_if>
                    </tmpl_loop>
                    <tmpl_unless name="records">
                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                            <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                            <td colspan="5">{tmpl_var name='no_packages_txt'}</td>
                        </tr>
                    </tmpl_unless>
                </tbody>

 interface/web/admin/templates/software_update_list.htm

@@ -38,7 +38,7 @@
                    </tmpl_loop>
                    <tmpl_unless name="records">
                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                            <td colspan="3">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                            <td colspan="3">{tmpl_var name='no_updates_txt'}</td>
                        </tr>
                    </tmpl_unless>
                </tbody>