Merge pull request #2072 from LuckyCyborg/4.0

[4.0] Overall improvements
nova-framework · Apr 30, 2018 · d96b30a · d96b30a
2 parents 722a92d + cc679ea
commit d96b30a
Show file tree

Hide file tree

Showing 25 changed files with 107 additions and 9 deletions.
diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.0.56');
+define('VERSION', '4.0.57');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options

diff --git a/modules/Contacts/Controllers/Admin/FieldGroups.php b/modules/Contacts/Controllers/Admin/FieldGroups.php
@@ -171,6 +171,7 @@ public function update(Request $request, $contactId, $id)
         $group->content = $input['content'];
         $group->order   = $input['order'];
 
+        //
         $group->updated_by = Auth::id();
 
         $group->save();

diff --git a/modules/Contacts/Controllers/Admin/FieldItems.php b/modules/Contacts/Controllers/Admin/FieldItems.php
@@ -193,8 +193,13 @@ public function store(Request $request, $id)
             'rules'   => $input['field_rules'],
             'options' => $options,
 
+            'visible' => $request->has('visible') ? 1 : 0,
+
             // Resolve the fieldGroup relationship.
             'field_group_id' => $group->id,
+
+            //
+            'created_by' => Auth::id(),
         ));
 
         // Invalidate the cached information.
@@ -413,8 +418,13 @@ public function update(Request $request, $groupId, $id)
         $item->order = $input['field_order'];
         $item->rules = $input['field_rules'];
 
+        $item->visible = $request->has('visible') ? 1 : 0;
+
         $item->options = $options;
 
+        //
+        $item->updated_by = Auth::id();
+
         $item->save();
 
         // Invalidate the cached information.

diff --git a/modules/Contacts/Controllers/Admin/Messages.php b/modules/Contacts/Controllers/Admin/Messages.php
@@ -33,11 +33,13 @@ public function index($id)
             return Redirect::back()->with('danger', __d('contacts', 'Contact not found: #{0}', $id));
         }
 
+        $fields = $contact->fieldItems->where('visible', 1)->lists('title', 'name');
+
         $messages = $contact->messages()->orderBy('created_at', 'DESC')->paginate(15);
 
         return $this->createView()
             ->shares('title', __d('contacts', 'Messages received by : {0}', $contact->name))
-            ->with(compact('contact', 'messages'))
+            ->with(compact('contact', 'fields', 'messages'))
             ->with('search', '')
             ->with('searching', false);
     }

diff --git a/modules/Contacts/Controllers/Messages.php b/modules/Contacts/Controllers/Messages.php
@@ -92,6 +92,8 @@ protected function validator(Contact $contact, Request $request)
         // Add the custom Validation Rule commands.
         $validator->addExtension('recaptcha', function($attribute, $value, $parameters) use ($request)
         {
+            if (Auth::check()) return true;
+
             return ReCaptcha::check($value, $request->ip());
         });
 

diff --git a/modules/Contacts/Database/Seeds/FieldItemsTableSeeder.php b/modules/Contacts/Database/Seeds/FieldItemsTableSeeder.php
@@ -37,6 +37,8 @@ public function run()
                 'default'     => '',
             ),
 
+            'visibble' => 1,
+
             'field_group_id' => 1,
             'created_by'     => 1,
         ));
@@ -54,6 +56,8 @@ public function run()
                 'default'     => '',
             ),
 
+            'visibble' => 1,
+
             'field_group_id' => 1,
             'created_by'     => 1,
         ));
@@ -71,6 +75,8 @@ public function run()
                 'default'     => '',
             ),
 
+            'visibble' => 0,
+
             'field_group_id' => 1,
             'created_by'     => 1,
         ));
@@ -88,6 +94,8 @@ public function run()
                 'rows'        => 10,
             ),
 
+            'visibble' => 1,
+
             'field_group_id' => 1,
             'created_by'     => 1,
         ));

diff --git a/modules/Contacts/Language/CS/messages.php b/modules/Contacts/Language/CS/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/DA/messages.php b/modules/Contacts/Language/DA/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/DE/messages.php b/modules/Contacts/Language/DE/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/EN/messages.php b/modules/Contacts/Language/EN/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/ES/messages.php b/modules/Contacts/Language/ES/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/FA/messages.php b/modules/Contacts/Language/FA/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/FR/messages.php b/modules/Contacts/Language/FR/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/IT/messages.php b/modules/Contacts/Language/IT/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/JA/messages.php b/modules/Contacts/Language/JA/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/NL/messages.php b/modules/Contacts/Language/NL/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/PL/messages.php b/modules/Contacts/Language/PL/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );
diff --git a/modules/Contacts/Language/RO/messages.php b/modules/Contacts/Language/RO/messages.php
@@ -78,6 +78,7 @@
   'Messages received by : {0}' => '',
   'Name' => '',
   'New message received via {0}' => '',
+  'No' => '',
   'No Field Groups' => '',
   'No Messages' => '',
   'No description' => '',
@@ -109,6 +110,7 @@
   'Show Field Item' => '',
   'Show Message' => '',
   'Show Role' => '',
+  'Show in lists' => '',
   'Show the Details' => '',
   'Show this Attachment' => '',
   'Site Path' => '',
@@ -146,5 +148,7 @@
   'View the Messages received by this Contact' => '',
   'View this Contact' => '',
   'View this Message' => '',
+  'Visible' => '',
+  'Yes' => '',
   'Your message was successfully sent.' => '',
 );