Changeset 10596

Timestamp:

Apr 23, 2011, 3:32:08 PM (14 years ago)

Author:

patdenice

Message:

Only reset one type of extension.

Location:

trunk

Files:

• admin/themes/default/template/updates_ext.tpl (modified) (4 diffs)
• admin/updates_ext.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (1 diff)

trunk/admin/themes/default/template/updates_ext.tpl

@@ -5 +5 @@
 {footer_script require='jquery.effects.blind,jquery.ajaxmanager,jquery.jgrowl'}
 var pwg_token = '{$PWG_TOKEN}';
-var extList = new Array();
+var extType = '{$EXT_TYPE}';
 var confirmMsg  = '{'Are you sure?'|@translate|@escape:'javascript'}';
 var errorHead   = '{'ERROR'|@translate|@escape:'javascript'}';
@@ -42 +42 @@
     url: 'ws.php',
     dataType: 'json',
-    data: { method: 'pwg.extensions.ignoreUpdate', reset: true, pwg_token: pwg_token, format: 'json' },
+    data: { method: 'pwg.extensions.ignoreUpdate', reset: true, type: extType, pwg_token: pwg_token, format: 'json' },
     success: function(data) {
       if (data['stat'] == 'ok') {
@@ -145 +145 @@
 
 <div class="autoupdate_bar">
-<br>
 <input type="submit" id="update_all" value="{'Update All'|@translate}" onClick="updateAll(); return false;">
 <input type="submit" id="ignore_all" value="{'Ignore All'|@translate}" onClick="ignoreAll(); return false;">
@@ -154 +153 @@
 </div>
 
-<p id="up_to_date" style="display:none; text-align:left; margin-left:20px;">{'All extensions are up to date.'|@translate}</p>
+<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>
 
 {if not empty($update_plugins)}

trunk/admin/updates_ext.php

@@ -28 +28 @@
 
 include_once(PHPWG_ROOT_PATH.'admin/include/updates.class.php');
-$autoupdate = new updates();
+$autoupdate = new updates($page['page']);
 
+$show_reset = false;
 if (!$autoupdate->get_server_extensions())
 {
@@ -77 +78 @@
     }
   }
+
+  if (!empty($conf['updates_ignored'][$type]))
+  {
+    $show_reset = true;
+  }
 }
 
-$template->assign('SHOW_RESET', (!empty($conf['updates_ignored']['plugins']) or !empty($conf['updates_ignored']['themes']) or !empty($conf['updates_ignored']['languages'])));
+$template->assign('SHOW_RESET', $show_reset);
 $template->assign('PWG_TOKEN', get_pwg_token());
+$template->assign('EXT_TYPE', $page['page'] == 'updates' ? 'extensions' : $page['page']);
 $template->set_filename('plugin_admin_content', 'updates_ext.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');

trunk/include/ws_functions.inc.php

@@ -2874 +2874 @@
   if ($params['reset'])
   {
-    $conf['updates_ignored'] = array(
-      'plugins'=>array(),
-      'themes'=>array(),
-      'languages'=>array()
-    );
+    if (!empty($params['type']) and isset($conf['updates_ignored'][$params['type']]))
+    {
+      $conf['updates_ignored'][$params['type']] = array();
+    }
+    else
+    {
+      $conf['updates_ignored'] = array(
+        'plugins'=>array(),
+        'themes'=>array(),
+        'languages'=>array()
+      );
+    }
     conf_update_param('updates_ignored', pwg_db_real_escape_string(serialize($conf['updates_ignored'])));
     unset($_SESSION['extensions_need_update']);