dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #127 from misfir3/master

Browse Source 
items ommited from menu spinner and some more clean up
This commit is contained in:
Doug Morato 2015-10-25 22:28:17 -04:00
commit 8bffb76e5b
7 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
View File

@ -34,7 +34,8 @@ public class LessonInfoModel {
if (lesson.getCategory().equals(Category.CHALLENGE)) {
this.numberHints = (lesson.isAuthorized(webSession, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS)) ? lesson.getHintCount(webSession) : 0;
this.hasSource = (lesson.isAuthorized(webSession, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS));
this.hasSolution = (lesson.isAuthorized(webSession, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS)); //assuming we want this as well
this.hasSolution = (lesson.isAuthorized(webSession, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS)); //assuming we want this to fall in line with source and solution
this.hasPlan = (lesson.isAuthorized(webSession, AbstractLesson.CHALLENGE_ROLE, WebSession.SHOWHINTS)); //assuming we want this to fall in line with source and solutionn
}
}

7
webgoat-container/src/main/webapp/js/goatApp/controller/LessonController.js
View File

@ -88,19 +88,18 @@ define(['jquery',
this.onContentLoaded = function(loadHelps) {
this.lessonInfoModel = new LessonInfoModel();
this.listenTo(this.lessonInfoModel,'info:loaded',this.onInfoLoaded); //TODO onInfoLoaded function to handle title view and helpview
this.listenTo(this.lessonInfoModel,'info:loaded',this.onInfoLoaded);
if (loadHelps) {
this.helpControlsView = null;
this.lessonView.model = this.lessonContent;
this.lessonView.render();
//load title view (initially hidden) << //TODO: currently handled via menu click but need to be able to handle via routed request
this.planView = new PlanView();
this.solutionView = new SolutionView();
this.sourceView = new SourceView();
this.lessonHintView = new HintView();
this.cookieView = new CookieView();
// parameter model & view
//TODO: instantiate model with values (not sure why was not working before)
var paramModel = new ParamModel({});
paramModel.set('screenParam',this.lessonContent.get('screenParam'));
@ -109,7 +108,7 @@ define(['jquery',
this.paramView = new ParamView({model:paramModel});
$('.lesson-help').hide();
}
}
this.trigger('menu:reload');
};

13
webgoat-container/src/main/webapp/js/goatApp/controller/MenuController.js
View File

@ -11,15 +11,22 @@ define(['jquery',
_.extend(Controller.prototype,Backbone.Events);
options = options || {};
this.menuView = options.menuView;
this.titleView = options.titleView;
this.initMenu = function() {
//this.listenTo(this.menuView,'lesson:click',this.renderTitle);
}
// this.initMenu = function() {
// this.listenTo(this.menuView,'lesson:click',this.renderTitle);
// }
this.updateMenu = function(){
this.menuView.updateMenu();
},
//TODO: move title rendering into lessonContent/View pipeline once data can support it
this.renderTitle = function(title) {
this.titleView.render(title);
}
};
return Controller;

3
webgoat-container/src/main/webapp/js/goatApp/model/LessonInfoModel.js
View File

@ -13,9 +13,8 @@ define(['jquery',
},
infoLoaded: function(data) {
console.log (data);
this.trigger('info:loaded',this,data);
}
});
});
});6

2
webgoat-container/src/main/webapp/js/goatApp/view/GoatRouter.js
View File

@ -33,7 +33,7 @@ define(['jquery',
init:function() {
goatRouter = new GoatAppRouter();
this.lessonController.start();
this.menuController.initMenu();
// this.menuController.initMenu();
goatRouter.on('route:attackRoute', function(scr,menu,stage) {
this.lessonController.loadLesson(scr,menu,stage);

3
webgoat-container/src/main/webapp/js/goatApp/view/LessonContentView.js
View File

@ -10,15 +10,18 @@ define(['jquery',
JQueryForm) {
return Backbone.View.extend({
el:'#lesson-content-wrapper', //TODO << get this fixed up in DOM
initialize: function(options) {
options = options || {};
},
render: function() {
this.$el.html(this.model.get('content'));
this.makeFormsAjax();
this.ajaxifyAttackHref();
$(window).scrollTop(0); //work-around til we get the scroll down sorted out
},
//TODO: reimplement this in custom fashion maybe?
makeFormsAjax: function () {
var options = {

1
webgoat-container/src/main/webapp/js/goatApp/view/TitleView.js
View File

@ -4,6 +4,7 @@ define(['jquery',
function($,_,Backbone) {
return Backbone.View.extend({
el:'#header #lesson-title-wrapper',
render:function(title) {
var lessonTitleEl = $('<h1>',{id:'lesson-title',text:title});
this.$el.html(lessonTitleEl);