clean up logging

get link pointer showing up correctly on submenu items (href was left off)
This commit is contained in:
lawson89 2014-08-17 10:26:15 -04:00
parent cfb4ebb2b6
commit 30f3c3a95f
3 changed files with 3 additions and 59 deletions

View File

@ -1,56 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.owasp.webgoat.service;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpSession;
import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.lessons.model.Hint;
import org.owasp.webgoat.session.WebSession;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/**
*
* @author rlawson
*/
@Controller
public class HintService extends BaseService {
/**
* Returns hints for current lesson
*
* @param session
* @return
*/
@RequestMapping(value = "/hint.mvc", produces = "application/json")
public @ResponseBody
List<Hint> showHint(HttpSession session) {
List<Hint> listHints = new ArrayList<Hint>();
WebSession ws = getWebSesion(session);
AbstractLesson l = ws.getCurrentLesson();
if (l == null) {
return listHints;
}
List<String> hints;
hints = l.getHintsPublic(ws);
if (hints == null) {
return listHints;
}
int idx = 0;
for (String h : hints) {
Hint hint = new Hint();
hint.setHint(h);
hint.setLesson(l.getName());
hint.setNumber(idx);
listHints.add(hint);
idx++;
}
return listHints;
}
}

View File

@ -67,9 +67,9 @@
<li class="sub-menu" ng-repeat="item in menuTopics">
<!-- TODO: implement conditional rendering -->
<a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
<ul class="slideDown" ng-show="expanded" style="display:block;">
<ul class="slideDown" ng-show="expanded">
<li ng-repeat="child in item.children">
<a ng-click="renderLesson(child.link)" title="link to {{child.name}}">{{child.name}}</a>
<a ng-click="renderLesson(child.link)" title="link to {{child.name}}" href="">{{child.name}}</a>
</li>
</ul>
</li>

View File

@ -41,7 +41,7 @@ goat.controller('goatMenu', function($scope, $http) {
goat.addMenuClasses = function(arr) {
for (var i = 0; i < arr.length; i++) {
var menuItem = arr[i];
console.log(menuItem);
//console.log(menuItem);
if (arr[i].type && arr[i].type === 'CATEGORY') {
arr[i].class = 'fa-angle-right pull-right';
}