Merge pull request #1178 from willkoua/1090-user-competence

Modification du champs competence
MaisonLogicielLibre · May 20, 2016 · ad5d66a · ad5d66a
2 parents 8ec57a9 + ede6294
commit ad5d66a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/config/app.php b/config/app.php
@@ -212,8 +212,8 @@
              * the following line and set the port accordingly
              */
             //'port' => 'nonstandard_port_number',
-            'username' => 'mllAdmin',
-            'password' => 'toto',
+            'username' => 'root',       //mllAdmin
+            'password' => '',     //toto
             'database' => 'mll_site',
             'encoding' => 'utf8',
             'timezone' => 'UTC',

diff --git a/src/Template/Users/edit.ctp b/src/Template/Users/edit.ctp
@@ -104,7 +104,11 @@
                             ]
                         ); ?>
                         <div id="bloodhound">
-                        <?= $this->Form->input('skills', ['type' => 'text', 'disabled' => true, 'placeholder' => __('Enter and select your skills')]); ?>
+                        <?php
+                            if ($user->isStudent && !$user->isProfessor && !$user->isAvailableMentoring) {
+                                echo $this->Form->input('skills', ['type' => 'text', 'disabled' => true, 'placeholder' => __('Enter and select your skills')]);
+                            }
+                        ?>
                         </div>
                         <br />
                         <h3 class="header-title"><?= __('Contact information'); ?></h3>