Revision e1a8d51a

b/web_client/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java
459 459
            if (published != null)
460 460
                updateFile.setHeader("X-Object-Public", published.toString());
461 461
            if (newPermissions != null) {
462
                String readPermHeader = "read=" + owner + ",";
463
                String writePermHeader = "write=" + owner + ",";
462
                String readPermHeader = "read=";
463
                String writePermHeader = "write=";
464 464
                for (String u : newPermissions.keySet()) {
465 465
                    Boolean[] p = newPermissions.get(u);
466 466
                    if (p[0] != null && p[0])
......
468 468
                    if (p[1] != null && p[1])
469 469
                        writePermHeader += u + ",";
470 470
                }
471
                if (readPermHeader.endsWith(","))
471
                if (readPermHeader.endsWith("="))
472
                    readPermHeader = "";
473
                else if (readPermHeader.endsWith(","))
472 474
                    readPermHeader = readPermHeader.substring(0, readPermHeader.length() - 1);
473
                if (writePermHeader.endsWith(","))
475
                if (writePermHeader.endsWith("="))
476
                    writePermHeader = "";
477
                else if (writePermHeader.endsWith(","))
474 478
                    writePermHeader = writePermHeader.substring(0, writePermHeader.length() - 1);
475
                String permHeader = readPermHeader +  ";" + writePermHeader;
479
                String permHeader = readPermHeader +  ((readPermHeader.length()  > 0 && writePermHeader.length() > 0) ?  ";" : "") + writePermHeader;
480
                if (permHeader.length() == 0)
481
                    permHeader="~";
476 482
                updateFile.setHeader("X-Object-Sharing", permHeader);
477 483
            }
478 484
            Scheduler.get().scheduleDeferred(updateFile);
b/web_client/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
356 356
            };
357 357
            updateFolder.setHeader("X-Auth-Token", app.getToken());
358 358
            if (newPermissions != null) {
359
                String readPermHeader = "read=" + folder.getOwner() + ",";
360
                String writePermHeader = "write=" + folder.getOwner() + ",";
359
                String readPermHeader = "read=";
360
                String writePermHeader = "write=";
361 361
                for (String u : newPermissions.keySet()) {
362 362
                    Boolean[] p = newPermissions.get(u);
363 363
                    if (p[0] != null && p[0])
......
365 365
                    if (p[1] != null && p[1])
366 366
                        writePermHeader += u + ",";
367 367
                }
368
                if (readPermHeader.endsWith(","))
368
                if (readPermHeader.endsWith("="))
369
                    readPermHeader = "";
370
                else if (readPermHeader.endsWith(","))
369 371
                    readPermHeader = readPermHeader.substring(0, readPermHeader.length() - 1);
370
                if (writePermHeader.endsWith(","))
372
                if (writePermHeader.endsWith("="))
373
                    writePermHeader = "";
374
                else if (writePermHeader.endsWith(","))
371 375
                    writePermHeader = writePermHeader.substring(0, writePermHeader.length() - 1);
372
                String permHeader = readPermHeader +  ";" + writePermHeader;
376
                String permHeader = readPermHeader +  ((readPermHeader.length()  > 0 && writePermHeader.length() > 0) ?  ";" : "") + writePermHeader;
377
                if (permHeader.length() == 0)
378
                    permHeader="~";
373 379
                updateFolder.setHeader("X-Object-Sharing", permHeader);
374 380
            }
375 381
            Scheduler.get().scheduleDeferred(updateFolder);

Also available in: Unified diff