From 03cf2db8379f5b734cf9200cfe042464c97c9a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Wed, 8 Apr 2015 12:34:57 +0200
Subject: [PATCH] Control DMSF via REST API #78

---
 app/controllers/dmsf_controller.rb | 6 +++++-
 app/views/dmsf/create.api.rsb      | 4 ++++
 app/views/dmsf_files/show.api.rsb  | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 app/views/dmsf/create.api.rsb

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index a6f68434..d7376b59 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -277,7 +277,11 @@ class DmsfController < ApplicationController
     
     respond_to do |format|
       format.js
-      format.api  { render_validation_errors(@folder) }
+      format.api  { 
+        unless saved                  
+          render_validation_errors(@folder) 
+        end        
+      }
       format.html { 
         if saved
           flash[:notice] = l(:notice_folder_created)      
diff --git a/app/views/dmsf/create.api.rsb b/app/views/dmsf/create.api.rsb
new file mode 100644
index 00000000..94caf8cc
--- /dev/null
+++ b/app/views/dmsf/create.api.rsb
@@ -0,0 +1,4 @@
+api.dmsf_folder do    
+  api.id @folder.id     
+  api.title @folder.title    
+end
\ No newline at end of file
diff --git a/app/views/dmsf_files/show.api.rsb b/app/views/dmsf_files/show.api.rsb
index 4f265db2..e846a86d 100644
--- a/app/views/dmsf_files/show.api.rsb
+++ b/app/views/dmsf_files/show.api.rsb
@@ -1,4 +1,4 @@
-api.file do
+api.dmsf_file do
   api.id @file.id
   api.name @file.name
   api.project_id @file.project_id