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
4aba22a9
Commit
4aba22a9
authored
Jul 28, 2016
by
Vladimir Baranov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rref #5392. Remove channel from list after deletion
parent
e718c1fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
messaging.js
app/components/messaging/messaging.js
+3
-1
messaging_service.js
app/components/messaging/messaging_service.js
+3
-0
index.html
app/components/messaging/templates/index.html
+2
-2
No files found.
app/components/messaging/messaging.js
View file @
4aba22a9
...
@@ -184,7 +184,9 @@ angular.module("ulakbus.messaging")
...
@@ -184,7 +184,9 @@ angular.module("ulakbus.messaging")
case
'_zops_delete_channel'
:
case
'_zops_delete_channel'
:
iScope
.
deleteConfirmation
(
'Kanalı silmek istediğinize emin misiniz?'
)
iScope
.
deleteConfirmation
(
'Kanalı silmek istediğinize emin misiniz?'
)
.
then
(
function
(){
.
then
(
function
(){
MessagingService
.
delete_channel
(
getKey
(
channel
));
MessagingService
.
delete_channel
(
getKey
(
channel
)).
then
(
function
(){
iScope
.
selectedChannel
=
null
;
});
});
});
break
;
break
;
...
...
app/components/messaging/messaging_service.js
View file @
4aba22a9
...
@@ -275,6 +275,9 @@ angular.module('ulakbus.messaging', ['ui.bootstrap'])
...
@@ -275,6 +275,9 @@ angular.module('ulakbus.messaging', ['ui.bootstrap'])
};
};
return
wsRequest
(
outgoing
).
then
(
function
(
result
){
return
wsRequest
(
outgoing
).
then
(
function
(
result
){
$log
.
info
(
"Channel "
,
channelKey
,
" deleted: "
,
result
);
$log
.
info
(
"Channel "
,
channelKey
,
" deleted: "
,
result
);
if
(
channelsMap
[
channelKey
]){
channelsMap
[
channelKey
].
deleted
=
true
;
}
return
result
;
return
result
;
})
})
};
};
...
...
app/components/messaging/templates/index.html
View file @
4aba22a9
...
@@ -11,12 +11,12 @@
...
@@ -11,12 +11,12 @@
<ul
class=
"channels"
>
<ul
class=
"channels"
>
<li
class=
"title"
>
KANALLAR
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"createChannel()"
></span></li>
<li
class=
"title"
>
KANALLAR
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"createChannel()"
></span></li>
<li
ng-class=
"{'unread': ch.unread, 'public-ro-channel': ch.read_only, 'active': isChannelSelected(ch)}"
title=
"{{ch.description}}"
ng-repeat=
"ch in publicChannels"
ng-click=
"selectChannel(ch)"
>
{{ch.name}}
</li>
<li
ng-class=
"{'unread': ch.unread, 'public-ro-channel': ch.read_only, 'active': isChannelSelected(ch)}"
title=
"{{ch.description}}"
ng-repeat=
"ch in publicChannels"
ng-click=
"selectChannel(ch)"
ng-hide=
"ch.deleted"
>
{{ch.name}}
</li>
</ul>
</ul>
<ul
class=
"direct-messages"
>
<ul
class=
"direct-messages"
>
<li
class=
"title"
>
MESAJLAR
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"searchUser()"
></span></li>
<li
class=
"title"
>
MESAJLAR
<span
class=
"add-action glyphicon glyphicon-plus-sign"
ng-click=
"searchUser()"
></span></li>
<li
ng-class=
"{'unread': userChannel.unread, 'active': isChannelSelected(userChannel), 'online': userChannel.is_online}"
ng-repeat=
"userChannel in directChannels"
ng-click=
"selectChannel(userChannel)"
>
{{userChannel.name}}
</li>
<li
ng-class=
"{'unread': userChannel.unread, 'active': isChannelSelected(userChannel), 'online': userChannel.is_online}"
ng-repeat=
"userChannel in directChannels"
ng-click=
"selectChannel(userChannel)"
ng-hide=
"userChannel.deleted"
>
{{userChannel.name}}
</li>
</ul>
</ul>
</div>
</div>
...
...
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