Commit a8cb2bfa authored by Evren Kutar's avatar Evren Kutar

grunt config for production +

http-server path fix
scope listnode fix for formservice
parent 7eede52e
...@@ -20,7 +20,7 @@ var app = angular.module( ...@@ -20,7 +20,7 @@ var app = angular.module(
'ulakbus.student', 'ulakbus.student',
'schemaForm', 'schemaForm',
'gettext', 'gettext',
'templates-prod' //'templates-prod'
]). ]).
/** /**
* RESTURL is the url of rest api to talk * RESTURL is the url of rest api to talk
......
...@@ -108,10 +108,9 @@ ...@@ -108,10 +108,9 @@
<script src="components/auth/auth_controller.js"></script> <script src="components/auth/auth_controller.js"></script>
<script src="components/auth/auth_service.js"></script> <script src="components/auth/auth_service.js"></script>
<script src="components/dashboard/dashboard.js"></script> <script src="components/dashboard/dashboard_controller.js"></script>
<script src="components/staff/staff_controller.js"></script> <script src="components/staff/staff_controller.js"></script>
<script src="components/student/student_controller.js"></script> <script src="components/student/student_controller.js"></script>
<script src="components/dashboard/dashboard.js"></script>
<!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>--> <!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>-->
</body> </body>
......
...@@ -25,7 +25,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout, ...@@ -25,7 +25,7 @@ form_generator.factory('Generator', function ($http, $q, $log, $modal, $timeout,
); );
// if fieldset in form, make it collapsable with template // if fieldset in form, make it collapsable with template
scope.listnodeform = {}; scope.listnodeform = {};
if (scope.listnodes[0] || scope.nodes[0]) { if ((scope.listnode && scope.listnodes[0]) || (scope.nodes && scope.nodes[0])) {
angular.forEach(scope.form, function (key, val) { angular.forEach(scope.form, function (key, val) {
if (typeof key == "object" && key.type == "fieldset") { if (typeof key == "object" && key.type == "fieldset") {
// change type to use shared template for form // change type to use shared template for form
......
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
<script src="components/dashboard/dashboard_controller.js"></script> <script src="components/dashboard/dashboard_controller.js"></script>
<script src="components/staff/staff_controller.js"></script> <script src="components/staff/staff_controller.js"></script>
<script src="components/student/student_controller.js"></script> <script src="components/student/student_controller.js"></script>
<script src="components/dashboard/dashboard.js"></script>
<!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>--> <!--<script src="bower_components/quantumui/dist/js/quantumui-nojq.js"></script>-->
<!-- @endif --> <!-- @endif -->
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"scripts": { "scripts": {
"postinstall": "bower install", "postinstall": "bower install",
"prestart": "npm install", "prestart": "npm install",
"start": "http-server -a localhost -p 8000 -c-1", "start": "http-server app/ -a localhost -p 8000 -c-1",
"pretest": "npm install", "pretest": "npm install",
"test": "karma start karma.conf.js", "test": "karma start karma.conf.js",
"test-single-run": "karma start karma.conf.js --single-run", "test-single-run": "karma start karma.conf.js --single-run",
......
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