added setting delete button

ongr-io · Sep 5, 2016 · f962940 · f962940
1 parent 760e287
commit f962940
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 39 deletions.
diff --git a/Controller/SettingsController.php b/Controller/SettingsController.php
@@ -59,17 +59,14 @@ public function updateValueAction(Request $request)
      * Setting delete action
      *
      * @param Request $request
-     * @param $id
      *
      * @return JsonResponse
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request)
     {
         try {
-            /** @var Repository $repo */
-            $repo = $this->get($this->getParameter('ongr_settings.repo'));
-
-            $repo->remove($id);
+            $manager = $this->get('ongr_settings.settings_manager');
+            $manager->delete($request->get('name'));
 
             return new JsonResponse(['error' => false]);
         } catch (\Exception $e) {

diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
@@ -55,19 +55,7 @@ ongr_settings_settings_update_value:
         expose: true
 
 ongr_settings_settings_delete:
-    path: /settings/delete/{id}
+    path: /settings/delete
     defaults: { _controller: ONGRSettingsBundle:Settings:delete }
     options:
-        expose: true
-
-#ongr_settings_profiles_fallback:
-#    path: /profiles/{url}
-#    defaults: { _controller: ONGRSettingsBundle:Profiles:list, url: null }
-#    requirements:
-#        url: .*
-
-#ongr_settings_fallback:
-#    path: /settings/{url}
-#    defaults: { _controller: ONGRSettingsBundle:Settings:list, url: null }
-#    requirements:
-#        url: .*
+        expose: true
diff --git a/Resources/js/script.js b/Resources/js/script.js
@@ -46,7 +46,9 @@ $(document).ready(function () {
                 "targets": 4,
                 "data": null,
                 "orderable": false,
-                "defaultContent": '<a class="edit btn btn-primary btn-xs" data-toggle="modal" data-target="#setting-edit">Edit</a>&nbsp;<a class="delete btn btn-danger btn-xs" data-toggle="modal" data-target="#setting-delete">Delete</a>'
+                "render": function ( data, type, row ) {
+                    return '<a class="edit btn btn-primary btn-xs" data-toggle="modal" data-target="#setting-edit">Edit</a>&nbsp;<a class="delete delete-setting btn btn-danger btn-xs" data-name="'+row['name']+'">Delete</a>'
+                }
             } ]
     } );
 
@@ -184,18 +186,24 @@ $(document).ready(function () {
         })
     } );
 
-//            $('#setting_delete_submit').on('click', function () {
-//                var id = $(this).attr('rel');
-//                $.ajax({
-//                    url: "./settings/delete/"+id,
-//                    success: function (data) {
-//                        if (data.error) {
-//                            alert(data.message);
-//                        } else {
-//                            table.ajax.reload();
-//                            $('.modal').modal('hide');
-//                        }
-//                    }
-//                });
-//            });
+    $('#settings tbody').on( 'click', 'a.delete-setting', function (e) {
+        e.preventDefault();
+
+        var name = $(this).data('name');
+        $.confirm({
+            text: "Are you sure you want to delete "+name+" setting?",
+            title: "Confirmation required",
+            confirm: function(button) {
+                $.post(Routing.generate('ongr_settings_settings_delete'), {name: name}, function(data) {
+                    if (data.error == false) {
+                        table.ajax.reload();
+                    }
+                });
+            },
+            confirmButton: "Yes, delete it",
+            cancelButton: "No",
+            confirmButtonClass: "btn-danger",
+            dialogClass: "modal-dialog modal-lg"
+        });
+    });
 });
diff --git a/Resources/public/script.js b/Resources/public/script.js
diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig
@@ -9,6 +9,7 @@
             <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
             <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.12/css/dataTables.bootstrap.css">
+            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/2.5.1/jquery-confirm.min.css">
             <link href="{{ asset('bundles/ongrsettings/style.css') }}" type="text/css" rel="stylesheet">
         {% endblock %}
         <script src="https://use.fontawesome.com/df9d1609ee.js"></script>
@@ -40,11 +41,11 @@
         {% block javascripts %}
             <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
             <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>
-
             <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
             <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.12/js/jquery.dataTables.min.js"></script>
             <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.12/js/dataTables.bootstrap.min.js"></script>
             <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
+            <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/2.5.1/jquery-confirm.min.js"></script>
             <script type="text/javascript" src="{{ asset('bundles/ongrsettings/script.js') }}"></script>
         {% endblock %}
     </body>

diff --git a/Service/SettingsManager.php b/Service/SettingsManager.php
@@ -201,12 +201,17 @@ public function update($name, $data = [])
      *
      * @param string    $name
      *
+     * @throws \LogicException
      * @return array
      */
     public function delete($name)
     {
-        $setting = $this->repo->findOneBy(['name' => $name]);
-        return $this->repo->remove($setting->getId());
+        if ($this->has($name)) {
+            $setting = $this->repo->findOneBy(['name' => $name]);
+            return $this->repo->remove($setting->getId());
+        }
+
+        throw new \LogicException(sprintf('Setting with name %s doesn\'t exist.', $name));
     }
 
     /**