Fix bugs

claroline · Apr 16, 2015 · 43e28a9 · 43e28a9
1 parent 1ad19f2
commit 43e28a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/Library/Installation/Plugin/DatabaseWriter.php b/Library/Installation/Plugin/DatabaseWriter.php
@@ -395,21 +395,19 @@ private function updateIcons(array $resource, ResourceType $resourceType, Plugin
     }
 
     /**
-     * @param array $actions
+     * @param array $action
      */
-    public function persistResourceAction(array $actions)
+    public function persistResourceAction(array $action)
     {
-        foreach ($actions as $action) {
-            $resourceAction = new MenuAction();
+        $resourceAction = new MenuAction();
 
-            $resourceAction->setName($action['name']);
-            $resourceAction->setAsync(1);
-            $resourceAction->setIsForm($action['is_form']);
-            $resourceAction->setIsCustom(1);
-            $resourceAction->setValue(1);
+        $resourceAction->setName($action['name']);
+        $resourceAction->setAsync(1);
+        $resourceAction->setIsForm($action['is_form']);
+        $resourceAction->setIsCustom(1);
+        $resourceAction->setValue(1);
 
-            $this->em->persist($resourceAction);
-        }
+        $this->em->persist($resourceAction);
 
         $this->em->flush();
     }

diff --git a/Resources/public/js/resource/manager/views/resource/thumbnail.js b/Resources/public/js/resource/manager/views/resource/thumbnail.js
@@ -35,22 +35,14 @@
             var isCustom = event.currentTarget.getAttribute('data-is-custom') === 'yes';
             var eventName = isCustom ? 'custom-action' : action;
             var isForm = event.currentTarget.getAttribute('data-action-type') === 'display-form';
+            eventName = isCustom && isForm ? 'custom-action-form' : eventName;
 
-            if (isCustom && isForm) {
-                this.dispatcher.trigger('custom-action-form', {
-                    action: action,
-                    nodeId: nodeId,
-                    view: this.parameters.viewName,
-                    isCustomAction: true
-                });
-            } else {
-                this.dispatcher.trigger(eventName, {
-                    action: action,
-                    nodeId: nodeId,
-                    view: this.parameters.viewName,
-                    isCustomAction: false
-                });
-            }
+            this.dispatcher.trigger(eventName, {
+                action: action,
+                nodeId: nodeId,
+                view: this.parameters.viewName,
+                isCustomAction: isCustom
+            });
         },
         render: function (node, isSelectionAllowed) {
             this.el.id = node.id;