Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
a8cb2bfa
Commit
a8cb2bfa
authored
Aug 19, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
grunt config for production +
http-server path fix scope listnode fix for formservice
parent
7eede52e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
6 deletions
+4
-6
app.js
app/app.js
+1
-1
index.html
app/index.html
+1
-2
form_service.js
app/zetalib/forms/form_service.js
+1
-1
index.html
index.html
+0
-1
package.json
package.json
+1
-1
No files found.
app/app.js
View file @
a8cb2bfa
...
@@ -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
...
...
app/index.html
View file @
a8cb2bfa
...
@@ -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>
...
...
app/zetalib/forms/form_service.js
View file @
a8cb2bfa
...
@@ -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
...
...
index.html
View file @
a8cb2bfa
...
@@ -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 -->
...
...
package.json
View file @
a8cb2bfa
...
@@ -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"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment