Commit 290467c0 authored by Evren Kutar's avatar Evren Kutar

Merge branch 'feature/issue-5073' into develop

parents 7166c2aa 7cf9103f
...@@ -34,6 +34,19 @@ body { ...@@ -34,6 +34,19 @@ body {
font-weight: normal; font-weight: normal;
} }
.form-container {
width: 650px;
background-color: #fff;
padding: 25px;
border-radius: 3px;
margin-left: auto;
margin-right: auto;
-webkit-box-shadow: 0 0 25px rgba(0,0,0,0.04);
-moz-box-shadow: 0 0 25px rgba(0,0,0,0.04);
box-shadow: 0 0 25px rgba(0,0,0,0.04);
}
.form-control { .form-control {
box-shadow:none; box-shadow:none;
border-radius:0; border-radius:0;
......
<div class="container-fluid"> <div class="container-fluid">
<div ng-class="{'col-md-8': meta.allow_filters}"> <div ng-class="{'col-md-8': meta.allow_filters}">
<msgbox ng-show="msgbox"></msgbox>
<h3>{{ schema.title }}</h3> <h3>{{ schema.title }}</h3>
<crud-show-directive ng-if="object"></crud-show-directive> <crud-show-directive ng-if="object"></crud-show-directive>
<crud-form-directive ng-if="forms"></crud-form-directive> <crud-form-directive ng-if="forms"></crud-form-directive>
......
<div> <div class="clearfix" ng-class="{'form-container': !objects || grouping.length < 1 }">
<div class="buttons-on-top"></div> <div class="buttons-on-top"></div>
<form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model" <form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model"
......
...@@ -793,16 +793,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -793,16 +793,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
.post(generator.makeUrl(scope), scope.form_params) .post(generator.makeUrl(scope), scope.form_params)
.then(function (res) { .then(function (res) {
generator.button_switch(true); generator.button_switch(true);
if (res.data.client_cmd) { return generator.pathDecider(res.data.client_cmd, scope, res.data);
return generator.pathDecider(res.data.client_cmd, scope, res.data);
}
if (res.data.msgbox) {
scope.msgbox = res.data.msgbox;
var newElement = $compile("<msgbox></msgbox>")(scope);
// this is the default action, which is removing page items and reload page with msgbox
angular.element(document.querySelector('.main.ng-scope')).children().remove();
angular.element(document.querySelector('.main.ng-scope')).append(newElement);
}
}); });
}; };
///** ///**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment