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
6bc64990
Commit
6bc64990
authored
Sep 29, 2016
by
Vladimir Baranov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX, rclose#5480. Fix right panel keeps to be visible
parent
07d73273
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
auth_service.js
app/components/auth/auth_service.js
+2
-2
staff.html
app/components/dashboard/user-templates/staff.html
+5
-5
staff.html
app/components/uitemplates/staff.html
+5
-5
directives.js
app/shared/directives.js
+3
-0
No files found.
app/components/auth/auth_service.js
View file @
6bc64990
...
...
@@ -87,11 +87,11 @@ angular.module('ulakbus.auth')
* @returns {*}
*/
authService
.
logout
=
function
()
{
$rootScope
.
loginAttempt
=
0
;
WSOps
.
request
({
wf
:
'logout'
}).
then
(
function
(
data
)
{
$rootScope
.
loggedInUser
=
false
;
$rootScope
.
current_user
=
true
;
$rootScope
.
$broadcast
(
"user_logged_out"
);
$log
.
debug
(
"loggedout"
);
$location
.
path
(
"/login"
);
WSOps
.
close
();
...
...
app/components/dashboard/user-templates/staff.html
View file @
6bc64990
...
...
@@ -19,8 +19,8 @@
<div
class=
"dashboard-search-results"
ng-show=
"showResults"
>
<ul
ng-if=
"students.length > 0"
>
<li
ng-repeat=
"student in students"
>
<a
role=
"button"
>
<span
ng-click=
"select(student, 'ogrenci')"
>
{{student[0]}}
</span>
<a
role=
"button"
ng-click=
"select(student, 'ogrenci')"
>
<span>
{{student[0]}}
</span>
<i
class=
"fa fa-fw fa-info-circle pull-right"
popover-placement=
"bottom"
uib-popover-template=
"userPopover.templateUrl"
ng-click=
"get_info('Ogrenci', student[2])"
></i></a>
...
...
@@ -42,8 +42,8 @@
<div
class=
"dashboard-search-results"
ng-show=
"showResults"
>
<ul
ng-if=
"staffs.length > 0"
>
<li
ng-repeat=
"staff in staffs"
>
<a
role=
"button"
>
<span
ng-click=
"select(staff, 'personel')"
>
{{staff[0]}}
</span>
<a
role=
"button"
ng-click=
"select(staff, 'personel')"
>
<span>
{{staff[0]}}
</span>
<i
class=
"fa fa-fw fa-info-circle pull-right"
popover-placement=
"bottom"
uib-popover-template=
"userPopover.templateUrl"
...
...
app/components/uitemplates/staff.html
View file @
6bc64990
...
...
@@ -19,8 +19,8 @@
<div
class=
"dashboard-search-results"
ng-show=
"showResults"
>
<ul
ng-if=
"students.length > 0"
>
<li
ng-repeat=
"student in students"
>
<a
role=
"button"
>
<span
ng-click=
"select(student, 'ogrenci')"
>
{{student[0]}}
</span>
<a
role=
"button"
ng-click=
"select(student, 'ogrenci')"
>
<span>
{{student[0]}}
</span>
<i
class=
"fa fa-fw fa-info-circle pull-right"
popover-placement=
"bottom"
uib-popover-template=
"userPopover.templateUrl"
ng-click=
"get_info('Ogrenci', student[2])"
></i></a>
...
...
@@ -42,8 +42,8 @@
<div
class=
"dashboard-search-results"
ng-show=
"showResults"
>
<ul
ng-if=
"staffs.length > 0"
>
<li
ng-repeat=
"staff in staffs"
>
<a
role=
"button"
>
<span
ng-click=
"select(staff, 'personel')"
>
{{staff[0]}}
</span>
<a
role=
"button"
ng-click=
"select(staff, 'personel')"
>
<span>
{{staff[0]}}
</span>
<i
class=
"fa fa-fw fa-info-circle pull-right"
popover-placement=
"bottom"
uib-popover-template=
"userPopover.templateUrl"
...
...
app/shared/directives.js
View file @
6bc64990
...
...
@@ -459,6 +459,9 @@ angular.module('ulakbus')
delete
$scope
.
selectedMenuItems
;
};
// clean selection when user logged out
$rootScope
.
$on
(
'user_logged_out'
,
$scope
.
deselectUser
);
$rootScope
.
$watch
(
function
(
$rootScope
)
{
return
$rootScope
.
section
;
},
...
...
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