Subversion Repositories SmartDukaan

Rev

Rev 1176 | Rev 2424 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1176 Rev 2095
Line 110... Line 110...
110
 
110
 
111
	private Map<Long, List<Long>> catSlides;
111
	private Map<Long, List<Long>> catSlides;
112
	
112
	
113
	private Map<Long, List<Entity>> catEntities;
113
	private Map<Long, List<Entity>> catEntities;
114
	
114
	
-
 
115
	private List<Long> inconsistentEntities;
115
		// GET /entity/1
116
		// GET /entity/1
116
    public String show() {
117
    public String show() {
117
    	log.info("EntityController.show");
118
    	log.info("EntityController.show");
118
    	
119
    	
119
    	try {
120
    	try {
Line 138... Line 139...
138
    public HttpHeaders index() {
139
    public HttpHeaders index() {
139
    	log.info("EntityController.index");
140
    	log.info("EntityController.index");
140
    	
141
    	
141
    	try {
142
    	try {
142
			this.entitiesState = CreationUtils.getEntitiesState();
143
			this.entitiesState = CreationUtils.getEntitiesState();
-
 
144
			inconsistentEntities = CreationUtils.getInconsistentEntities();
143
			//Must be called after getting entities state
145
			//Must be called after getting entities state
144
			createEntitiesForItemsInProcess();
146
			createEntitiesForItemsInProcess();
-
 
147
			
145
		} catch (Exception e) {
148
		} catch (Exception e) {
146
			log.error(CreationUtils.getStackTrace(e));
149
			log.error(CreationUtils.getStackTrace(e));
147
			this.setErrorString(CreationUtils.getStackTrace(e));
150
			this.setErrorString(CreationUtils.getStackTrace(e));
148
			return new DefaultHttpHeaders("fatal");
151
			return new DefaultHttpHeaders("fatal");
149
		}
152
		}
Line 1497... Line 1500...
1497
    
1500
    
1498
    public Collection<User> getAllUsers(){
1501
    public Collection<User> getAllUsers(){
1499
    	return UserManager.getUserManager().getAllUsers();
1502
    	return UserManager.getUserManager().getAllUsers();
1500
    }
1503
    }
1501
    
1504
    
-
 
1505
    public List<Long> getInconsistentEntities(){
-
 
1506
        return this.inconsistentEntities;
1502
    
1507
    }
1503
	
1508
	
1504
}
1509
}
1505
 
1510