Merge pull request maestrano#125 from clemthenem/improvment/purchase_…

…workflow [MNOE-170] - Purchase Workflow
MichaelSedov · Oct 20, 2016 · e7f74b1 · e7f74b1
2 parents 9102c4d + bd7ec97
commit e7f74b1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/api/app/controllers/mno_enterprise/jpi/v1/app_instances_controller.rb b/api/app/controllers/mno_enterprise/jpi/v1/app_instances_controller.rb
@@ -3,11 +3,18 @@ class Jpi::V1::AppInstancesController < Jpi::V1::BaseResourceController
 
     # GET /mnoe/jpi/v1/organization/1/apps.json?timestamp=151452452345
     def index
-      @app_instances = parent_organization.app_instances.select do |i| 
+      @app_instances = parent_organization.app_instances.select do |i|
         i.active? && i.updated_at > Time.at(timestamp) && can?(:access,i)
       end
     end
-
+
+    # POST /mnoe/jpi/v1/organization/1/app_instances
+    def create
+      authorize! :manage_app_instances, parent_organization
+      app_instance = parent_organization.app_instances.create(product: params[:nid])
+      head :created
+    end
+
     # DELETE /mnoe/jpi/v1/app_instances/1
     def destroy
       app_instance = MnoEnterprise::AppInstance.find(params[:id])
@@ -17,7 +24,7 @@ def destroy
         MnoEnterprise::EventLogger.info('app_destroy', current_user.id, "App destroyed", app_instance.name,app_instance)
         app_instance.terminate
       end
-      
+
       head :accepted
     end
   end

diff --git a/api/config/routes.rb b/api/config/routes.rb
@@ -107,7 +107,7 @@
         end
 
         # AppInstances
-        resources :app_instances, only: [:index, :destroy], shallow: true
+        resources :app_instances, only: [:index, :create, :destroy], shallow: true
 
         # Teams
         resources :teams, only: [:index, :show, :create, :update, :destroy], shallow: true do

diff --git a/api/spec/routing/mno_enterprise/jpi/v1/app_instances_controller_routing_spec.rb b/api/spec/routing/mno_enterprise/jpi/v1/app_instances_controller_routing_spec.rb
@@ -3,10 +3,17 @@
 module MnoEnterprise
   RSpec.describe Jpi::V1::AppInstancesController, type: :routing do
     routes { MnoEnterprise::Engine.routes }
-    
+
     it 'routes to #index' do
       expect(get('/jpi/v1/organizations/1/app_instances')).to route_to("mno_enterprise/jpi/v1/app_instances#index", organization_id: '1')
     end
+
+    it 'routes to #create' do
+      expect(post('/jpi/v1/organizations/1/app_instances')).to route_to("mno_enterprise/jpi/v1/app_instances#create", organization_id: '1' )
+    end
+
+    it 'routes to #destroy' do
+      expect(delete('/jpi/v1/app_instances/1')).to route_to("mno_enterprise/jpi/v1/app_instances#destroy", id: '1' )
+    end
   end
 end
-
diff --git a/frontend/app/assets/stylesheets/mno_enterprise/variables.less b/frontend/app/assets/stylesheets/mno_enterprise/variables.less
@@ -18,9 +18,12 @@
 /*-----------------------------------------------------------------------*/
 /*                              Login Page                               */
 /*-----------------------------------------------------------------------*/
-@login-bg-color:                     @bg-main-color;
-@login-box-grid-position:            { margin-top: 80px; .make-sm-column(4); .make-sm-column-offset(4); };
 
+@login-bg-img:                       "mno_enterprise/login-background.jpg";
+@login-bg-color:                      @bg-main-color;
+@login-box-grid-position:             { margin-top: 80px; .make-sm-column(4); .make-sm-column-offset(4); };
+
+@login-box-corners:                   0px;
 @login-box-title-color:               @decorator-main-color;
 @login-box-title:                     { text-transform: uppercase; };
 @login-box-title-display-box-arrow:   false;