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
29f5334e
Commit
29f5334e
authored
Jun 11, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
define dev url for rest api
use it system-wide
parent
29785656
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
7 deletions
+27
-7
app.js
app/app.js
+9
-0
form_generator.js
app/forms/form_generator.js
+14
-5
index.html
app/index.html
+2
-0
login_service.js
app/login/login_service.js
+2
-2
No files found.
app/app.js
View file @
29f5334e
...
@@ -15,9 +15,11 @@ angular.module(
...
@@ -15,9 +15,11 @@ angular.module(
'ngAnimate'
,
'ngAnimate'
,
'ngQuantum'
,
'ngQuantum'
,
'general'
,
'general'
,
'formGenerator'
,
'zaerp.dashboard'
,
'zaerp.dashboard'
,
'zaerp.login'
,
'zaerp.login'
,
'zaerp.version'
,
'zaerp.version'
,
'zaerp.test'
,
'schemaForm'
'schemaForm'
]).
]).
config
([
'$routeProvider'
,
function
(
$routeProvider
)
{
config
([
'$routeProvider'
,
function
(
$routeProvider
)
{
...
@@ -46,6 +48,13 @@ angular.module(
...
@@ -46,6 +48,13 @@ angular.module(
}
}
});
});
}).
}).
constant
(
"RESTURL"
,
(
function
(){
var
dev
=
"http://127.0.0.1:3000/api/"
;
var
prod
=
""
;
var
ENV
=
"dev"
;
// change to prod in production
return
ENV
==
"dev"
?
{
url
:
dev
}
:
{
url
:
prod
};
return
"http://127.0.0.1:3000/api/"
;
})()).
constant
(
"USER_ROLES"
,
{
constant
(
"USER_ROLES"
,
{
all
:
"*"
,
all
:
"*"
,
admin
:
"admin"
,
admin
:
"admin"
,
...
...
app/forms/form_generator.js
View file @
29f5334e
...
@@ -5,15 +5,24 @@
...
@@ -5,15 +5,24 @@
* (GPLv3). See LICENSE.txt for details.
* (GPLv3). See LICENSE.txt for details.
*/
*/
var
form_generator
=
angular
.
module
(
'
F
ormGenerator'
,
[]);
var
form_generator
=
angular
.
module
(
'
f
ormGenerator'
,
[]);
form_generator
.
factory
(
'Generator'
,
function
()
{
form_generator
.
factory
(
'Generator'
,
function
(
$http
,
RESTURL
)
{
var
generator
=
{};
var
generator
=
{};
generator
.
generate
=
function
(
modelObject
)
{
generator
.
generate
=
function
(
modelObject
)
{
return
generator
.
group
(
modelObject
);
return
generator
.
group
(
modelObject
);
};
};
generator
.
group
=
function
(
form_items
)
{
generator
.
group
=
function
(
form_items
)
{
return
form_items
;
return
form_items
;
};
};
generator
.
get_form
=
function
(
url
,
getParams
)
{
return
$http
.
get
(
RESTURL
.
url
+
url
+
getParams
)
.
then
(
function
(
res
)
{
if
(
res
.
data
)
{
return
res
.
data
;
}
});
};
return
generator
;
return
generator
;
});
});
\ No newline at end of file
app/index.html
View file @
29f5334e
...
@@ -98,6 +98,8 @@
...
@@ -98,6 +98,8 @@
<script
src=
"app.js"
></script>
<script
src=
"app.js"
></script>
<script
src=
"zlib/general.js"
></script>
<script
src=
"zlib/general.js"
></script>
<script
src=
"forms/form_generator.js"
></script>
<script
src=
"test_view_for_generator/testfile.js"
></script>
<!-- login js -->
<!-- login js -->
...
...
app/login/login_service.js
View file @
29f5334e
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
// TODO: login url change with correct one
// TODO: login url change with correct one
login
.
factory
(
'LoginService'
,
function
(
$http
,
$rootScope
,
$location
,
Session
)
{
login
.
factory
(
'LoginService'
,
function
(
$http
,
$rootScope
,
$location
,
Session
,
RESTURL
)
{
var
loginService
=
{};
var
loginService
=
{};
loginService
.
login
=
function
(
credentials
)
{
loginService
.
login
=
function
(
credentials
)
{
...
@@ -19,7 +19,7 @@ login.factory('LoginService', function ($http, $rootScope, $location, Session) {
...
@@ -19,7 +19,7 @@ login.factory('LoginService', function ($http, $rootScope, $location, Session) {
getParams
+=
k
+
"="
+
credentials
[
k
]
+
"&"
;
getParams
+=
k
+
"="
+
credentials
[
k
]
+
"&"
;
}
}
return
$http
return
$http
.
get
(
'http://127.0.0.1:8000/
login'
+
getParams
)
.
get
(
RESTURL
.
url
+
'
login'
+
getParams
)
.
then
(
function
(
res
)
{
.
then
(
function
(
res
)
{
if
(
res
.
data
.
success
){
if
(
res
.
data
.
success
){
$rootScope
.
loggedInUser
=
true
;
$rootScope
.
loggedInUser
=
true
;
...
...
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