- Timestamp:
- Apr 23, 2011, 3:32:08 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/themes/default/template/updates_ext.tpl
r10538 r10596 5 5 {footer_script require='jquery.effects.blind,jquery.ajaxmanager,jquery.jgrowl'} 6 6 var pwg_token = '{$PWG_TOKEN}'; 7 var ext List = new Array();7 var extType = '{$EXT_TYPE}'; 8 8 var confirmMsg = '{'Are you sure?'|@translate|@escape:'javascript'}'; 9 9 var errorHead = '{'ERROR'|@translate|@escape:'javascript'}'; … … 42 42 url: 'ws.php', 43 43 dataType: 'json', 44 data: { method: 'pwg.extensions.ignoreUpdate', reset: true, pwg_token: pwg_token, format: 'json' },44 data: { method: 'pwg.extensions.ignoreUpdate', reset: true, type: extType, pwg_token: pwg_token, format: 'json' }, 45 45 success: function(data) { 46 46 if (data['stat'] == 'ok') { … … 145 145 146 146 <div class="autoupdate_bar"> 147 <br>148 147 <input type="submit" id="update_all" value="{'Update All'|@translate}" onClick="updateAll(); return false;"> 149 148 <input type="submit" id="ignore_all" value="{'Ignore All'|@translate}" onClick="ignoreAll(); return false;"> … … 154 153 </div> 155 154 156 <p id="up_to_date" style="display:none; text-align:left; margin-left:20px;">{'All extensions are up to date.'|@translate}</p>155 <p id="up_to_date" style="display:none; text-align:left; margin-left:20px;">{'All %s are up to date.'|@sprintf:$EXT_TYPE|@translate}</p> 157 156 158 157 {if not empty($update_plugins)} -
trunk/admin/updates_ext.php
r10511 r10596 28 28 29 29 include_once(PHPWG_ROOT_PATH.'admin/include/updates.class.php'); 30 $autoupdate = new updates( );30 $autoupdate = new updates($page['page']); 31 31 32 $show_reset = false; 32 33 if (!$autoupdate->get_server_extensions()) 33 34 { … … 77 78 } 78 79 } 80 81 if (!empty($conf['updates_ignored'][$type])) 82 { 83 $show_reset = true; 84 } 79 85 } 80 86 81 $template->assign('SHOW_RESET', (!empty($conf['updates_ignored']['plugins']) or !empty($conf['updates_ignored']['themes']) or !empty($conf['updates_ignored']['languages'])));87 $template->assign('SHOW_RESET', $show_reset); 82 88 $template->assign('PWG_TOKEN', get_pwg_token()); 89 $template->assign('EXT_TYPE', $page['page'] == 'updates' ? 'extensions' : $page['page']); 83 90 $template->set_filename('plugin_admin_content', 'updates_ext.tpl'); 84 91 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content'); -
trunk/include/ws_functions.inc.php
r10563 r10596 2874 2874 if ($params['reset']) 2875 2875 { 2876 $conf['updates_ignored'] = array( 2877 'plugins'=>array(), 2878 'themes'=>array(), 2879 'languages'=>array() 2880 ); 2876 if (!empty($params['type']) and isset($conf['updates_ignored'][$params['type']])) 2877 { 2878 $conf['updates_ignored'][$params['type']] = array(); 2879 } 2880 else 2881 { 2882 $conf['updates_ignored'] = array( 2883 'plugins'=>array(), 2884 'themes'=>array(), 2885 'languages'=>array() 2886 ); 2887 } 2881 2888 conf_update_param('updates_ignored', pwg_db_real_escape_string(serialize($conf['updates_ignored']))); 2882 2889 unset($_SESSION['extensions_need_update']);
Note: See TracChangeset
for help on using the changeset viewer.