Commit 58260ab2 authored by Evren Kutar's avatar Evren Kutar

change expression of selected user and search user/student on dashboard

parent 4a771c72
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="dashboard-main-search clearfix"> <div class="dashboard-main-search clearfix">
<div class="row" ng-show="$root.current_user.is_staff"> <div class="row" ng-show="$root.current_user.can_search">
<div class="col-md-12"> <div class="col-md-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
......
...@@ -357,6 +357,9 @@ app.directive('logout', function ($http, $location, RESTURL) { ...@@ -357,6 +357,9 @@ app.directive('logout', function ($http, $location, RESTURL) {
$rootScope.searchInputs = data; $rootScope.searchInputs = data;
$rootScope.current_user = data.current_user; $rootScope.current_user = data.current_user;
if (data.ogreci || data.personel) {
$rootScope.current_user.can_search = true;
}
$rootScope.settings = data.settings; $rootScope.settings = data.settings;
$scope.menuItems = $scope.prepareMenu({other: $scope.allMenuItems.other}); $scope.menuItems = $scope.prepareMenu({other: $scope.allMenuItems.other});
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="sidebar-container"> <div class="sidebar-container">
<!-- sidebar-person-info --> <!-- sidebar-person-info -->
<div class="sidebar-person-info" ng-show="$root.current_user.is_staff"> <div class="sidebar-person-info" ng-show="$root.current_user.can_search">
<!--<button class="btn btn-primary close-sidebar-person-info">Profili Kapat</button>--> <!--<button class="btn btn-primary close-sidebar-person-info">Profili Kapat</button>-->
<div class="identity"> <div class="identity">
<button type="button" class="close" ng-class="{hidden: $root.collapsed || !selectedUser}" <button type="button" class="close" ng-class="{hidden: $root.collapsed || !selectedUser}"
......
This diff is collapsed.
...@@ -315,7 +315,7 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache", ...@@ -315,7 +315,7 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
"\n" + "\n" +
" <div class=\"dashboard-main-search clearfix\">\n" + " <div class=\"dashboard-main-search clearfix\">\n" +
"\n" + "\n" +
" <div class=\"row\" ng-show=\"$root.current_user.is_staff\">\n" + " <div class=\"row\" ng-show=\"$root.current_user.can_search\">\n" +
" <div class=\"col-md-12\">\n" + " <div class=\"col-md-12\">\n" +
" <div class=\"panel panel-default\">\n" + " <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" + " <div class=\"panel-heading\">\n" +
...@@ -1296,7 +1296,7 @@ angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCa ...@@ -1296,7 +1296,7 @@ angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCa
"\n" + "\n" +
" <div class=\"sidebar-container\">\n" + " <div class=\"sidebar-container\">\n" +
" <!-- sidebar-person-info -->\n" + " <!-- sidebar-person-info -->\n" +
" <div class=\"sidebar-person-info\" ng-show=\"$root.current_user.is_staff\">\n" + " <div class=\"sidebar-person-info\" ng-show=\"$root.current_user.can_search\">\n" +
" <!--<button class=\"btn btn-primary close-sidebar-person-info\">Profili Kapat</button>-->\n" + " <!--<button class=\"btn btn-primary close-sidebar-person-info\">Profili Kapat</button>-->\n" +
" <div class=\"identity\">\n" + " <div class=\"identity\">\n" +
" <button type=\"button\" class=\"close\" ng-class=\"{hidden: $root.collapsed || !selectedUser}\"\n" + " <button type=\"button\" class=\"close\" ng-class=\"{hidden: $root.collapsed || !selectedUser}\"\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