Changeset 6977 for extensions/AMetaData/admin

Timestamp:

Sep 20, 2010, 12:44:47 AM (14 years ago)

Author:

grum

Message:

Migration from version 0.4.0 to 0.5.1 implemented

Location:

extensions/AMetaData/admin

Files:

• amd_install_page.tpl (modified) (2 diffs)
• amd_metadata_tags.tpl (modified) (2 diffs)
• amd_metadata_tags_iKeywordsList.tpl (modified) (2 diffs)
• plugin_admin.php (modified) (2 diffs)

extensions/AMetaData/admin/amd_install_page.tpl

@@ -5 +5 @@
   function submitForm()
   {
+    $('#btSubmit').css('display', 'none');
+    $('#iImgWait').css('display', 'block');
+
     if($('#iInterfaceModeB').get(0).checked)
     {
@@ -55 +58 @@
   </fieldset>
 
-  <input type="button" onclick='submitForm();'  value="{'g003_validate'|@translate}">
+  <input id='btSubmit' type="button" onclick='submitForm();'  value="{'g003_validate'|@translate}">
+  <img id='iImgWait' src='./plugins/GrumPluginClasses/icons/processing.gif' style='display:none;margin-left:40px;'>
 
 </form>

extensions/AMetaData/admin/amd_metadata_tags.tpl

@@ -23 +23 @@
               "{/literal}{'g003_number_of_keywords'|@translate}{literal} "+$("#iListTags table tr").length
             );
+
+            if($("#iListTags table tr").length==0)
+            {
+              $('#iApply').css('display', 'none');
+            }
+            else
+            {
+              $('#iApply').css('display', 'block');
+            }
           }
       }
@@ -82 +91 @@
 <div id="iListTagsNb"></div>
 
-<input type="button" value="{'g003_convert_keywords_and_apply'|@translate}" id='iApply' onclick='convertKeywordsList();'>
+<input type="button" value="{'g003_convert_keywords_and_apply'|@translate}" id='iApply' onclick='convertKeywordsList();' style='display:none;'>
 
 <script type='text/javascript'>

extensions/AMetaData/admin/amd_metadata_tags_iKeywordsList.tpl

@@ -8 +8 @@
 {/literal}
 
-
+{if count($datas)>0}
 <table class="littlefont listTags {$themeconf.name}" style="width:100%;">
   {foreach from=$datas key=name item=data}
@@ -23 +23 @@
   {/foreach}
 </table>
+{else}
+<br>
+{'g003_no_keywords'|@translate}
+{/if}

extensions/AMetaData/admin/plugin_admin.php

@@ -20 +20 @@
 if (!defined('PHPWG_ROOT_PATH')) { die('Hacking attempt!'); }
 
-global $prefixeTable;
+global $prefixeTable, $template;
 
 load_language('plugin.lang', AMD_PATH);
@@ -26 +26 @@
 $main_plugin_object = get_plugin_data($plugin_id);
 
-/*
- * if the plugin is newly installed, display a special configuration page
- * otherwise, display normal page
- */
 
-$config=Array();
-GPCCore::loadConfig('amd', $config);
 
-if($config['newInstall']=='n')
+
+
+if(CommonPlugin::checkGPCRelease(3,2,0))
 {
-  include(AMD_PATH."amd_aip.class.inc.php");
-  $plugin_ai = new AMD_AIP($prefixeTable, $main_plugin_object->getFileLocation());}
+  $config=Array();
+  GPCCore::loadConfig('amd', $config);
+
+
+  if(!isset($config['installed'])) $config['installed']='00.04.00';
+  if($config['installed']!=AMD_VERSION2)
+  {
+    /* the plugin was updated without being deactivated
+     * deactivate + activate the plugin to process the database upgrade
+     */
+    include(AMD_PATH."amd_install.class.inc.php");
+    $amd=new AMD_install($prefixeTable, dirname(__FILE__));
+    $amd->deactivate();
+    $amd->activate();
+    $template->delete_compiled_templates();
+    $config['newInstall']='n';
+  }
+
+  /*
+   * if the plugin is newly installed, display a special configuration page
+   * otherwise, display normal page
+   */
+  if($config['newInstall']=='n')
+  {
+    include(AMD_PATH."amd_aip.class.inc.php");
+    $plugin_ai = new AMD_AIP($prefixeTable, $main_plugin_object->getFileLocation());}
+  else
+  {
+    include(AMD_PATH."amd_aip_install.class.inc.php");
+    $plugin_ai = new AMD_AIPInstall($prefixeTable, $main_plugin_object->getFileLocation());
+  }
+}
 else
 {
-  include(AMD_PATH."amd_aip_install.class.inc.php");
-  $plugin_ai = new AMD_AIPInstall($prefixeTable, $main_plugin_object->getFileLocation());
+  /*
+   * plugin was upgraded, but GPC was not
+   * display a page to inform user to upgrade GPC
+   */
+  include(AMD_PATH."amd_aip_release.class.inc.php");
+  $plugin_ai = new AMD_AIPRelease($prefixeTable, $main_plugin_object->getFileLocation());
 }
 
 $plugin_ai->manage();
 
+
+
+
 ?>