Merge pull request #90 from delphianer/master

fix issue in register form
phalcon · Nov 29, 2022 · ac4f52a · ac4f52a
2 parents d6f649a + efe25cd
commit ac4f52a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/db/migrations/1.0.0/users.dat b/db/migrations/1.0.0/users.dat
@@ -1 +1 @@
-1,demo,c0bd96dc7ea4ec56741a4e07f6ce98012814d853,"Phalcon Demo",demo@phalcon.io,"2012-04-10 20:53:03",0
+1,demo,c0bd96dc7ea4ec56741a4e07f6ce98012814d853,"Phalcon Demo",demo@phalcon.io,"2012-04-10 20:53:03","Y"
diff --git a/db/migrations/1.0.0/users.php b/db/migrations/1.0.0/users.php
@@ -79,7 +79,7 @@ public function morph()
                     new Column(
                         'active',
                         [
-                            'type' => Column::TYPE_BOOLEAN,
+                            'type' => Column::TYPE_VARCHAR,
                             'notNull' => true,
                             'size' => 1,
                             'after' => 'created_at'

diff --git a/public/js/utils.js b/public/js/utils.js
@@ -10,10 +10,10 @@ let Profile = {
         return true;
     },
     validate: function () {
-        if (SignUp.check("name") === false) {
+        if (Profile.check("name") === false) {
             return false;
         }
-        if (SignUp.check("email") === false) {
+        if (Profile.check("email") === false) {
             return false;
         }
         $("#profileForm")[0].submit();
@@ -56,5 +56,5 @@ var SignUp = {
 
 $(document).ready(function () {
     $("#registerForm .alert").hide();
-    $("div.profile .alert").hide();
+    $("#profileForm .alert").hide();
 });
diff --git a/themes/invo/invoices/profile.volt b/themes/invo/invoices/profile.volt
@@ -4,19 +4,19 @@
     <div class="form-group">
         <label for="name">Your Full Name:</label>
         {{ text_field("name", "size": "30", "class": "form-control") }}
-        <small class="form-text text-muted">
+        <div class="alert alert-warning" id="name_alert">
             <strong>Warning!</strong> Please enter your full name
-        </small>
+        </div>
     </div>
 
     <div class="form-group">
         <label for="email">Email Address:</label>
         {{ text_field("email", "size": "30", "class": "form-control") }}
-        <small class="form-text text-muted">
+        <div class="alert alert-warning" id="email_alert">
             <strong>Warning!</strong> Please enter your email
-        </small>
+        </div>
     </div>
 
     <input type="button" value="Update" class="btn btn-primary btn-large btn-info" onclick="Profile.validate()">
-    {{ link_to('invoices/index', 'Cancel') }}
+    {{ link_to('invoices/index', 'Cancel', "class": "btn btn-default") }}
 </form>
diff --git a/themes/invo/register/index.volt b/themes/invo/register/index.volt
@@ -2,7 +2,7 @@
     <h2>Register for INVO</h2>
 </div>
 
-<form action="/register" role="form" method="post">
+<form action="/register" id="registerForm" role="form" method="post">
     <fieldset>
         <div class="control-group">
             {{ form.label('name', ['class': 'control-label']) }}