Subversion Repositories SmartDukaan

Rev

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

Rev 2424 Rev 3574
Line 90... Line 90...
90 
    		// Entity's category first
 90 
    		// Entity's category first
91 
			long catID = entity.getCategoryID();
 91 
			long catID = entity.getCategoryID();
92 
			List<String[]> slidesData = this.getSlidesData(catID, selection,
92 
			List<String[]> slidesData = this.getSlidesData(catID, selection,
93 
					true);
 93 
					true);
94 
 
 94 
 
95 
			this.allSlidesData.add(slidesData);
 95 
			this.allSlidesData.add(slidesData);
96
- 
 
97 
			// Get slides for rest of the categories
 - 
 
98 
			long parentCatID  = (defs.getCategory(catID)).getParentCategory().getID();
 - 
 
99
- 
 
100 
			List<Category> cats = defs.getChildrenCategories(parentCatID);
 - 
 
101 
			for(Category cat : cats) {
 - 
 
102 
				if(cat.getID() != catID) {
 - 
 
103 
					// Case when same level categories dont have slides.
- 
 
104 
					if(defs.getCategorySlideSequence(cat.getID())== null){
 - 
 
105 
						continue;
 - 
 
106 
					}
 - 
 
107
- 
 
108 
					List<String[]> thisSlidesData =
- 
 
109 
						this.getSlidesData(cat.getID(), selection, false);
 - 
 
110 
					if(!thisSlidesData.isEmpty()){
 - 
 
111 
						this.allSlidesData.add(thisSlidesData);
 - 
 
112 
					}
 - 
 
113 
				}
 - 
 
114 
			}
 - 
 
115
- 
 
116 
		} catch (Exception e) {
 96 
		} catch (Exception e) {
117 
			log.error(CreationUtils.getStackTrace(e));
 97 
			log.error(CreationUtils.getStackTrace(e));
118 
			this.setErrorString(CreationUtils.getStackTrace(e));
 98 
			this.setErrorString(CreationUtils.getStackTrace(e));
119 
			return "fatal";
 99 
			return "fatal";
120 
		}
 100 
		}