Skip to content

U
ulakbus-ui
Commit ac9ef425 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

link generator bug fix for value == -1

parent 5e142f88
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 27 deletions
app/zetalib/forms/form_service.js
View file @ ac9ef425
......@@ -68,7 +68,8 @@ form_generator.factory('Generator', function ($http, $q, $timeout, RESTURL, Form
title: v.title,
onClick: function(){
if (v.cmd) {
scope.model["cmd"] = v.cmd;
// todo: cmd property to form_params, test it!
scope.form_params["cmd"] = v.cmd;
} else {
scope.model[k]=1;
}
......@@ -215,9 +216,6 @@ form_generator.factory('Generator', function ($http, $q, $timeout, RESTURL, Form
};
generator.itemLinksGenerator = function (scope, itemlist) {
angular.forEach(itemlist.data.nobjects, function (value, key) {
//var detailLink = "#/" + scope.url + "detail/" + scope.form_params.model;
//var addLink = "#/" + scope.url + "add/" + scope.form_params.model;
//var editLink = "#/" + scope.url + "edit/" + scope.form_params.model;
function makelink (page) {
if (value === '-1') {
return;
......@@ -228,21 +226,19 @@ form_generator.factory('Generator', function ($http, $q, $timeout, RESTURL, Form
if (page === 'edit/' || page === 'detail/') {
link += "/" + page + value[0];
}
if (page === 'add/') {
link += "/add";
}
if (scope.form_params.param) {
link += "?" + scope.form_params.param + "=" + scope.form_params.id;
}
return link;
}
itemlist.data.nobjects.addLink = makelink("add/");
value[2] = {detailLink: makelink("detail/"), editLink: makelink("edit/")};
if (value !== '-1') {
value[2] = {detailLink: makelink("detail/"), editLink: makelink("edit/")};
}
});
};
generator.get_form = function (scope) {
......@@ -316,7 +312,7 @@ form_generator.factory('Generator', function ($http, $q, $timeout, RESTURL, Form
var data = {
"form": $scope.model,
"cmd": $scope.form_params.cmd,
"subcmd": "do_list",
//"subcmd": "do_list",
"model": $scope.form_params.model,
"token": $scope.token
};
......
dist/app.js
View file @ ac9ef425
This diff is collapsed.
dist/bower_components/components.js
View file @ ac9ef425
This diff is collapsed.
dist/templates.js
View file @ ac9ef425
......@@ -1305,31 +1305,39 @@ angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCa
" <span class=\"menu-text\" ng-class=\"{hidden: $root.collapsed}\">Panel</span>\n" +
" </a>\n" +
" </li>\n" +
" \n" +
"\n" +
" <li ng-repeat=\"(key, item) in menuItems\" ng-class=\"{active: collapseVar == $index+1}\">{{dropDown}}\n" +
" <a href=\"\" ng-click=\"check($index+1)\">\n" +
" <i class=\"fa fa-fw fa-cogs\"\n" +
" ng-class=\"{\n" +
" 'other': 'fa fa-fw fa-wrench',\n" +
" 'ogrenci': 'fa fa-fw fa-university',\n" +
" 'personel': 'fa fa-fw fa-users'}[key]\"></i>\n" +
" 'personel': 'fa fa-fwkey-users'}[item[0].baseCategory]\"></i>\n" +
" <span class=\"menu-text\" ng-class=\"{hidden: $root.collapsed}\">{{ key }}</span>\n" +
" <span class=\"fa arrow\" ng-class=\"{hidden: $root.collapsed}\"></span>\n" +
" </a>\n" +
" <ul class=\"nav nav-second-level\" ng-class=\"{hidden: $root.collapsed}\">\n" +
" <li ng-repeat=\"(key2, item2) in item\">\n" +
" <a href=\"#\">{{key2}} <span class=\"fa arrow\"></span></a>\n" +
" <ul class=\"nav nav-third-level collapse in\" aria-expanded=\"true\">\n" +
" <li ng-repeat=\"(k,v) in item2\">\n" +
" <a ng-if=\"key == 'other'\" ng-href=\"#{{v.url}}\"\n" +
" ng-click=\"breadcrumb([key, v.text], $event)\">{{v.text}}</a>\n" +
" <a ng-if=\"key == 'ogrenci' || key == 'personel'\"\n" +
" ng-href=\"#{{v.url}}/list?{{v.param}}={{$root.selectedUser.key}}\"\n" +
" ng-click=\"breadcrumb([key, v.text], $event)\">{{v.text}}</a>\n" +
" </li>\n" +
" </ul>\n" +
" <!-- /.nav-third-level -->\n" +
" <li ng-repeat=\"(k, v) in item\">\n" +
" <a ng-if=\"v['baseCategory'] == 'other'\" ng-href=\"#{{v.url}}\"\n" +
" ng-click=\"breadcrumb([key, v.text], $event)\">{{v.text}}</a>\n" +
" <a ng-if=\"v['baseCategory'] == 'ogrenci' || v['baseCategory'] == 'personel'\"\n" +
" ng-href=\"#{{v.url}}/list?{{v.param}}={{$root.selectedUser.key}}\"\n" +
" ng-click=\"breadcrumb([key, v.text], $event)\">{{v.text}}</a>\n" +
" </li>\n" +
"\n" +
" <!--<li ng-repeat=\"(key2, item2) in item\">-->\n" +
" <!--<a href=\"#\">{{key2}} <span class=\"fa arrow\"></span></a>-->\n" +
" <!--<ul class=\"nav nav-third-level collapse in\" aria-expanded=\"true\">-->\n" +
" <!--<li ng-repeat=\"(k,v) in item2\">-->\n" +
" <!--<a ng-if=\"key == 'other'\" ng-href=\"#{{v.url}}\"-->\n" +
" <!--ng-click=\"breadcrumb([key, v.text], $event)\">{{v.text}}</a>-->\n" +
" <!--<a ng-if=\"key == 'ogrenci' || key == 'personel'\"-->\n" +
" <!--ng-href=\"#{{v.url}}/list?{{v.param}}={{$root.selectedUser.key}}\"-->\n" +
" <!--ng-click=\"breadcrumb([key, v.text], $event)\">{{v.text}}</a>-->\n" +
" <!--</li>-->\n" +
" <!--</ul>-->\n" +
" <!--&lt;!&ndash; /.nav-third-level &ndash;&gt;-->\n" +
" <!--</li>-->\n" +
" </ul>\n" +
" <!-- /.nav-second-level -->\n" +
" </li>\n" +
......
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