Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fouten/chartomvang&layoutlijst&flexibel' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-03-28 15:06:36 +02:00
parent b80ceeb342 bf0b652caa
commit 41573315e4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+2 -2
View File
@@ -66,10 +66,10 @@ class MY_Controller extends CI_Controller{
// public $version = '1.17.89'; // printformulier
// public $version = '1.17.90'; // sops ordenen per eigen criterium
// public $version = '1.17.91'; // grafieken in 3d
// public $version = '1.17.92'; // 2 nieuwe onderdelen in Compact Sop
// public $version = '1.17.92'; // Scan en Verbeteraanpak Pa.O.in Compact Sop
// public $version = '1.17.93';// stuur bijlage bij new wachtwoord
public $version = '1.17.94';// verbeteringen invullijst, fout omvang
public $version = '1.17.95';// verbeteringen invullijst, fout omvang
public $partituurid;
public $globProfielVersieID = 1;
application/views/monpas/pages/beheer.php
+1 -2
View File
@@ -2,8 +2,7 @@
<div class="row" id ="pagBindBeheer">
<div class= "col-sm-12" >
<!-- ko foreach: beheermenu -->
<div class="submenuitem2"
data-bind="click:$parent.fChangeMenu, css:{'selected': $parent.selectedMenu() && $parent.selectedMenu().id == id}">
<div class="submenuitem2"data-bind="click:$parent.fChangeMenu, css:{'selected': $parent.selectedMenu() && $parent.selectedMenu().id == id}">
<span data-bind="text: naam"> </span>
</div>
<!-- /ko -->