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
d3c39738
Commit
d3c39738
authored
Feb 19, 2016
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX issue items on rfix #5145 fixes GH-87 fixes zetaops/ulakbusGH-195
parent
ceb5b67f
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
9 deletions
+13
-9
crud_controller.js
app/components/crud/crud_controller.js
+5
-1
form.html
app/components/crud/templates/form.html
+1
-1
form_service.js
app/zetalib/form_service.js
+4
-4
app.js
dist/app.js
+2
-2
templates.js
dist/templates.js
+1
-1
No files found.
app/components/crud/crud_controller.js
View file @
d3c39738
...
...
@@ -265,8 +265,11 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
$scope
.
reload
({});
};
$scope
.
resetCmd
=
function
()
{
var
pageData
=
Generator
.
getPageData
();
CrudUtility
.
generateParam
(
$scope
,
pageData
,
$routeParams
.
cmd
);
delete
$scope
.
token
;
$scope
.
cmd
=
'reset'
;
delete
$scope
.
filters
;
delete
$scope
.
cmd
;
Generator
.
get_wf
(
$scope
);
};
...
...
@@ -353,6 +356,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
replace
:
true
,
link
:
function
(
$scope
)
{
$scope
.
form_params
.
filters
=
$scope
.
form_params
.
filters
||
{};
$scope
.
form_params
.
token
=
$scope
.
token
;
$scope
.
filterList
=
{};
$scope
.
filterCollapsed
=
{};
$scope
.
$watch
(
'list_filters'
,
function
()
{
...
...
app/components/crud/templates/form.html
View file @
d3c39738
<div
class=
"clearfix"
ng-class=
"{'form-container': !objects
|| grouping.length < 1
}"
>
<div
class=
"clearfix"
ng-class=
"{'form-container': !objects}"
>
<div
class=
"buttons-on-top"
></div>
<form
id=
"formgenerated"
name=
"formgenerated"
sf-schema=
"schema"
sf-form=
"form"
sf-model=
"model"
...
...
app/zetalib/form_service.js
View file @
d3c39738
...
...
@@ -860,10 +860,10 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
* @param {Object} data
*/
generator
.
pathDecider
=
function
(
client_cmd
,
$scope
,
data
)
{
if
(
client_cmd
[
0
]
===
'reload'
||
client_cmd
[
0
]
===
'reset'
)
{
$rootScope
.
$broadcast
(
'reload_cmd'
,
$scope
.
reload_cmd
);
return
;
}
//
if (client_cmd[0] === 'reload' || client_cmd[0] === 'reset') {
//
$rootScope.$broadcast('reload_cmd', $scope.reload_cmd);
// //
return;
//
}
/**
* @memberof ulakbus.formService
* @ngdoc function
...
...
dist/app.js
View file @
d3c39738
This diff is collapsed.
Click to expand it.
dist/templates.js
View file @
d3c39738
...
...
@@ -119,7 +119,7 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
angular
.
module
(
"components/crud/templates/form.html"
,
[]).
run
([
"$templateCache"
,
function
(
$templateCache
)
{
$templateCache
.
put
(
"components/crud/templates/form.html"
,
"<div class=
\"
clearfix
\"
ng-class=
\"
{'form-container': !objects
|| grouping.length < 1
}
\"
>
\n
"
+
"<div class=
\"
clearfix
\"
ng-class=
\"
{'form-container': !objects}
\"
>
\n
"
+
" <div class=
\"
buttons-on-top
\"
></div>
\n
"
+
"
\n
"
+
" <form id=
\"
formgenerated
\"
name=
\"
formgenerated
\"
sf-schema=
\"
schema
\"
sf-form=
\"
form
\"
sf-model=
\"
model
\"\n
"
+
...
...
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