kopano_webapp
/
calendarimporter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'webapp22' into 'master' 

Fixed small bug: error message if folder is unaccessible [permissions...]

See merge request !2
This commit is contained in:
Christoph Haas 2016-11-01 02:12:43 +01:00
parent 187b2a60f2 dcd4615399
commit e70894c048
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml
View File

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e7c9c2bb-66f1-4e37-904c-d33d8c113bde" name="Default" comment=""> <list default="true" id="e7c9c2bb-66f1-4e37-904c-d33d8c113bde" name="Default" comment="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
</list>
<ignored path="calendarimporter.iws" /> <ignored path="calendarimporter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" /> <ignored path=".idea/dataSources.local.xml" />
@ -421,12 +419,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1477949602474</updated> <updated>1477949602474</updated>
<workItem from="1477949603566" duration="8606000" /> <workItem from="1477949603566" duration="9042000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="8606000" /> <option name="totallyTimeSpent" value="9042000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="65" y="24" width="1792" height="999" extended-state="6" /> <frame x="65" y="24" width="1792" height="999" extended-state="6" />

6
js/data/Actions.js
View File

@ -79,7 +79,7 @@ Zarafa.plugins.calendarimporter.data.Actions = {
if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) { if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
for (var i = 0; i < inbox.subStores.folders.totalLength; i++) { for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
var folder = inbox.subStores.folders.getAt(i); var folder = inbox.subStores.folders.getAt(i);
if (folder.get("container_class") == "IPF.Appointment") { if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
if (asDropdownStore) { if (asDropdownStore) {
allFolders.push([ allFolders.push([
folder.get("entryid"), folder.get("entryid"),
@ -100,7 +100,7 @@ Zarafa.plugins.calendarimporter.data.Actions = {
if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) { if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
for (var j = 0; j < pub.subStores.folders.totalLength; j++) { for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
var folder = pub.subStores.folders.getAt(j); var folder = pub.subStores.folders.getAt(j);
if (folder.get("container_class") == "IPF.Appointment") { if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
if (asDropdownStore) { if (asDropdownStore) {
allFolders.push([ allFolders.push([
folder.get("entryid"), folder.get("entryid"),
@ -175,4 +175,4 @@ Zarafa.plugins.calendarimporter.data.Actions = {
return result * sortOrder; return result * sortOrder;
} }
} }
}; };