v2.1.02

Author: Ross Parker

Policies/CHANGEDB.php

@@ -126,3 +126,8 @@
 ++$count;
 $sql[$count][0] = '2.1.01';
 $sql[$count][1] = "";
+
+//v2.1.02
+++$count;
+$sql[$count][0] = '2.1.02';
+$sql[$count][1] = "";

Policies/CHANGELOG.txt

@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v2.1.02
+-------
+Refactoring of linkTop divs
+
 v2.1.01
 -------
 Removed deprecated function calls

Policies/manifest.php

@@ -25,7 +25,7 @@
 $entryURL = 'policies_view.php';
 $type = 'Additional';
 $category = 'Other';
-$version = '2.1.01';
+$version = '2.1.02';
 $author = 'Ross Parker';
 $url = 'http://rossparker.org';
 

Policies/policies_manage.php

@@ -146,7 +146,7 @@
 
     $table->addActionColumn()
         ->addParam('policiesPolicyID')
-        ->addParam('search')
+        ->addParam('search', $search)
         ->format(function ($policies, $actions) use ($guid) {
             $actions->addAction('edit', __('Edit'))
             ->setURL('/modules/Policies/policies_manage_edit.php');

Policies/policies_manage_add.php

@@ -17,6 +17,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Http\Url;
 use Gibbon\Forms\Form;
 
 //Module includes
@@ -44,9 +45,10 @@
 
 
     if ($search != '') {
-        echo "<div class='linkTop'>";
-        echo "<a href='".$session->get('absoluteURL')."/index.php?q=/modules/Policies/policies_manage.php&search='".$search."'>".('Back to Search Results')."</a>";
-        echo "</div>";
+        $params = [
+            "search" => $search
+        ];
+        $page->navigator->addSearchResultsAction(Url::fromModuleRoute('Policies', 'policies_manage.php')->withQueryParams($params));
     }
 
     $form = Form::create('action', $session->get('absoluteURL').'/modules/Policies/policies_manage_addProcess.php?search='.$search );

Policies/policies_manage_edit.php

@@ -17,6 +17,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+use Gibbon\Http\Url;
 use Gibbon\Forms\Form;
 use Gibbon\Module\Policies\PoliciesGateway;
 
@@ -54,9 +55,10 @@
         } else {
             //Let's go!
              if ($search != '') {
-                echo "<div class='linkTop'>";
-                echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/Policies/policies_manage.php&search='.$search."'>".__('Back to Search Results')."</a>";
-                echo '</div>';
+                 $params = [
+                     "search" => $search
+                 ];
+                 $page->navigator->addSearchResultsAction(Url::fromModuleRoute('Policies', 'policies_manage.php')->withQueryParams($params));
             }
 
             $form = Form::create('action', $session->get('absoluteURL').'/modules/Policies/policies_manage_editProcess.php?policiesPolicyID='.$policiesPolicyID.'&search='.$search);

Policies/version.php

@@ -20,5 +20,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '2.1.01';
-$coreVersion = '22.0.00';
+$moduleVersion = '2.1.02';
+$coreVersion = '23.0.00';