Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
e6f742e7
Commit
e6f742e7
authored
6 years ago
by
Anoop HM
Browse files
Options
Download
Patches
Plain Diff
Issue #SB 2146 fix: spell fix
parent
4ac7846a
master
Dark_theme
SB-25589
SB-28090
aws_fileRead
contributions
dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/express-4.17.3
dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3
dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3
dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/express-4.17.3
dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/qs-6.10.3
desktop-common-consumption
filters_5.1.1
gcp
gcp_test
keshavprasadms-patch-1
keshavprasadms-patch-2
release-1.12
release-1.13
release-1.13.1
release-1.13.2
release-1.13.4
release-1.14
release-1.14-SP-2
release-1.14-sp3
release-1.14.6
release-1.15
release-1.15.1
release-1.7.2
release-1.8.1
release-2.0.0
release-2.0.0-hotfix
release-2.0.1
release-2.0.2
release-2.0.3
release-2.1.0
release-2.1.1
release-2.10.0
release-2.10.1
release-2.10.2
release-2.10.3
release-2.2.0
release-2.2.1
release-2.3.0
release-2.3.1
release-2.3.5
release-2.3.6
release-2.4.0
release-2.4.1
release-2.4.2
release-2.5.0
release-2.5.1
release-2.6.0
release-2.6.0-loadtest
release-2.6.5
release-2.6.6
release-2.7.0
release-2.8.0
release-2.8.1
release-2.8.10
release-2.8.11
release-2.8.12
release-2.8.2
release-2.8.3
release-2.8.4
release-2.8.5
release-2.8.6
release-2.8.7
release-2.8.8
release-2.8.9
release-2.9.0
release-3.0
release-3.0-merge
release-3.0.0
release-3.0.1
release-3.0.2
release-3.0.3
release-3.0.4
release-3.0.4-sso
release-3.1.0
release-3.1.1
release-3.1.2
release-3.2.0
release-3.2.1
release-3.2.10
release-3.2.11
release-3.2.12
release-3.2.13
release-3.2.14
release-3.2.2
release-3.2.3
release-3.2.4
release-3.3.0
release-3.3.0-telemetry-fix
release-3.3.1
release-3.3.2
release-3.4.0
release-3.4.1
release-3.4.2
release-3.4.3
release-3.4.4
release-3.4.5
release-3.4.6
release-3.4.7
release-3.5.0
release-3.5.1
release-3.5.2
release-3.5.3
release-3.6.0
release-3.6.1
release-3.6.5
release-3.6.6
release-3.7.0
release-3.7.1
release-3.7.2
release-3.8.0
release-3.8.1
release-3.8.2
release-3.8.3
release-3.9.0
release-3.9.1
release-3.9.2
release-3.9.3
release-4.0.0
release-4.0.1
release-4.0.2
release-4.1
release-4.1.0
release-4.1.1
release-4.10.0
release-4.10.0.1
release-4.10.1
release-4.10.2
release-4.10.2.1
release-4.10.2.2
release-4.10.3
release-4.2.0
release-4.2.1
release-4.3.0
release-4.3.1
release-4.4.0
release-4.4.1
release-4.5.0
release-4.5.1
release-4.5.2
release-4.6.0
release-4.7.0
release-4.7.1
release-4.8.0
release-4.8.5
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.0.1
release-5.0.0.2
release-5.0.0.3
release-5.0.1
release-5.0.2
release-5.1.0
release-5.1.1
release-sonarcloud
revert-3718-copypi
revert-3842-release-2.8.7
revert-3890-release-2.8.9
revert-4427-player-cache-issue
revert-4537-SB-19763
revert-5244-sh-809
revert-5260-SB-table-3.3.0
revert-8284-release-5.0.0
sharathkashyap-patch-1
Tags unavailable
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
.vscode/settings.json
+7
-0
.vscode/settings.json
src/app/client/src/app/modules/announcement/components/create/create.component.ts
+1
-1
...odules/announcement/components/create/create.component.ts
src/app/client/src/app/modules/announcement/components/file-uploader/file-uploader.component.ts
+1
-1
...ement/components/file-uploader/file-uploader.component.ts
src/app/client/src/app/modules/core/guard/auth-gard.service.ts
+3
-3
...pp/client/src/app/modules/core/guard/auth-gard.service.ts
src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.ts
+1
-0
...n/components/batch/create-batch/create-batch.component.ts
src/app/server.js
+1
-1
src/app/server.js
with
14 additions
and
6 deletions
+14
-6
.vscode/settings.json
0 → 100644
+
7
−
0
View file @
e6f742e7
{
"cSpell.words"
:
[
"Injectable"
,
"izitoast"
,
"uploader"
]
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app/client/src/app/modules/announcement/components/create/create.component.ts
+
1
−
1
View file @
e6f742e7
...
...
@@ -134,7 +134,7 @@ export class CreateComponent implements OnInit {
*/
public
config
:
ConfigService
;
/**
* Default method of class
s
CreateComponent
* Default method of class CreateComponent
*
* @param {ResourceService} resource To get language constant
* @param {FileUploadService} fileUpload To upload file
...
...
This diff is collapsed.
Click to expand it.
src/app/client/src/app/modules/announcement/components/file-uploader/file-uploader.component.ts
+
1
−
1
View file @
e6f742e7
...
...
@@ -22,7 +22,7 @@ export class FileUploaderComponent implements OnInit {
public
resourceService
:
ResourceService
;
/**
* Default method of class
s
FileUploaderComponent
* Default method of class FileUploaderComponent
*
* @param {FileUploadService} fileUpload To upload file
* @param {ResourceService} resource To get language constant
...
...
This diff is collapsed.
Click to expand it.
src/app/client/src/app/modules/core/guard/auth-gard.service.ts
+
3
−
3
View file @
e6f742e7
...
...
@@ -5,7 +5,7 @@ import { ConfigService, ResourceService, ToasterService } from '@sunbird/shared'
import
{
Observable
}
from
'
rxjs/Observable
'
;
/**
* Service for Route Guards to restrict the access of route
* based on roles and permission of logedin user.
* based on roles and permission of log
g
ed
in user.
*/
@
Injectable
()
export
class
AuthGuard
implements
CanActivate
,
CanActivateChild
{
...
...
@@ -24,8 +24,8 @@ export class AuthGuard implements CanActivate, CanActivateChild {
/**
* constructor
* @param {permissionService} permissionService Refrence of permission service to check permission
* @param {resourceService} resourceService Refrence of resourceService service
* @param {permissionService} permissionService Ref
e
rence of permission service to check permission
* @param {resourceService} resourceService Ref
e
rence of resourceService service
* @param {Router} route Reference of Router
*/
constructor
(
private
router
:
Router
,
permissionService
:
PermissionService
,
resourceService
:
ResourceService
,
...
...
This diff is collapsed.
Click to expand it.
src/app/client/src/app/modules/learn/components/batch/create-batch/create-batch.component.ts
+
1
−
0
View file @
e6f742e7
...
...
@@ -141,6 +141,7 @@ export class CreateBatchComponent implements OnInit, OnDestroy, AfterViewInit {
},
1000
);
}
getUserListWithQuery
(
query
,
type
)
{
this
.
disableSubmitBtn
=
false
;
if
(
this
.
userSearchTime
)
{
clearTimeout
(
this
.
userSearchTime
);
}
...
...
This diff is collapsed.
Click to expand it.
src/app/server.js
+
1
−
1
View file @
e6f742e7
...
...
@@ -112,7 +112,7 @@ function indexPage (req, res) {
res
.
locals
.
instance
=
process
.
env
.
sunbird_instance
res
.
render
(
path
.
join
(
__dirname
,
'
dist
'
,
'
index.ejs
'
))
}
app
.
get
(
'
/get/envData
'
,
keycloak
.
protect
(),
function
(
req
,
res
)
{
app
.
get
(
'
/get/envData
'
,
function
(
req
,
res
)
{
res
.
status
(
200
)
res
.
send
({
appId
:
appId
,
ekstep_env
:
ekstepEnv
})
res
.
end
()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets