Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5474d8ff
authored
Jun 19, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue
#268
fixed
parent
26b7eb4d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
5474d8ff
...
@@ -160,7 +160,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
...
@@ -160,7 +160,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$scope
.
showFreeCategory
=
!
scene
.
categories
;
$scope
.
showFreeCategory
=
!
scene
.
categories
;
scene
.
name
=
$translate
.
instant
(
scene
.
name
);
scene
.
name
=
$translate
.
instant
(
scene
.
name
);
$scope
.
viewingScene
=
scene
;
$scope
.
viewingScene
=
scene
;
scene
.
pictos
.
forEach
(
placePicto
);
scene
.
pictos
.
forEach
(
placePicto
);
$scope
.
loadingPictos
=
false
;
$scope
.
loadingPictos
=
false
;
//setTimeout(function () { $scope.$apply(); });
//setTimeout(function () { $scope.$apply(); });
...
@@ -492,6 +492,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
...
@@ -492,6 +492,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
.
success
(
function
(
studentPicto
)
{
.
success
(
function
(
studentPicto
)
{
$scope
.
showScene
(
$scope
.
viewingScene
.
id
);
$scope
.
showScene
(
$scope
.
viewingScene
.
id
);
//Reload selectedCategory data
$scope
.
selectedCategory
=
studentPicto
;
// notify
// notify
io
.
socket
.
post
(
'/stu/vocabulary'
,
{
io
.
socket
.
post
(
'/stu/vocabulary'
,
{
action
:
'update_category'
,
action
:
'update_category'
,
...
...
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