Merge pull request #402 from hhunderter/master

Feature #594 + Forum: Bugfix on install
IlchCMS · Jun 18, 2019 · 6674701 · 6674701
2 parents cd74eac + 08f285b
commit 6674701
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/application/modules/admin/controllers/admin/Modules.php b/application/modules/admin/controllers/admin/Modules.php
@@ -248,7 +248,7 @@ public function updateAction()
                 $moduleMapper->updateVersion($key, $config->config['version']);
                 $this->addMessage('updateSuccess');
             } finally {
-                $this->redirect(['action' => $this->getRequest()->getParam('from')]);
+                $this->redirect(['action' => $this->getRequest()->getParam('from'), 'anchor' => '#Module_'.$key]);
             }
         }
     }
@@ -267,7 +267,7 @@ public function localUpdateAction()
             $moduleMapper->updateVersion($key, $config->config['version']);
             $this->addMessage('updateSuccess');
         } finally {
-            $this->redirect(['action' => $this->getRequest()->getParam('from')]);
+            $this->redirect(['action' => $this->getRequest()->getParam('from'), 'anchor' => '#Module_'.$key]);
         }
     }
 

diff --git a/application/modules/admin/views/admin/modules/index.php b/application/modules/admin/views/admin/modules/index.php
@@ -82,7 +82,7 @@ function checkOwnDependencies($versionsOfModules, $moduleOnUpdateServer) {
                 }
 
                 if ($this->getUser()->hasAccess('module_'.$module->getKey()) && !$module->getSystemModule()): ?>
-                    <tr>
+                    <tr id="Module_<?=$module->getKey() ?>">
                         <td>
                             <?=$content['name'] ?>
                             <br />

diff --git a/application/modules/forum/config/config.php b/application/modules/forum/config/config.php
@@ -248,15 +248,15 @@ public function getUpdate($installedVersion)
                 file_put_contents(APPLICATION_PATH.'/modules/forum/static/css/groupappearance/'.$filename, $defaultCss);
                 $databaseConfig->set('forum_filenameGroupappearanceCSS', $filename);
 
-                $this->db()->query('INSERT INTO `[prefix]_forum_groupranking` (group_id,rank) VALUES(1,0);');
-
                 // Add table for group ranking, which is needed when deciding which appearance needs to be applied.
                 $this->db()->queryMulti('CREATE TABLE IF NOT EXISTS `[prefix]_forum_groupranking` (
                     `id` INT(11) NOT NULL AUTO_INCREMENT,
                     `group_id` INT(11) NULL DEFAULT NULL,
                     `rank` INT(11) NULL DEFAULT NULL,
                     PRIMARY KEY (`id`)
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;');
+
+                $this->db()->query('INSERT INTO `[prefix]_forum_groupranking` (group_id,rank) VALUES(1,0);');
         }
     }
 }