Changeset 4372

Timestamp:

01/28/14 17:35:32 (10 years ago)

Author:

andmor

Message:

Added to the UI the functionality to modify the schema access policy.

Location:

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site

Files:

• partials/accountDetails.html (modified) (5 diffs)
• partials/workspace.html (modified) (4 diffs)
• scripts/controllers.js (modified) (5 diffs)
• scripts/controllers.min.js (modified) (1 diff)
• scripts/services.js (modified) (1 diff)
• scripts/services.min.js (modified) (1 diff)
• styles/SCHEMAcat.css (modified) (1 diff)
• styles/SCHEMAcat.min.css (modified) (1 diff)

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/partials/accountDetails.html

@@ -16 +16 @@
                                     <span data-ng-bind="displayName"></span>
                                     <span>
-                                        <button data-ng-click="editDisplayName()" class="btn btn-info btn-xs" data-ng-if="displayName != 'guest'"><i class="icon-edit"></i> Edit</button>
+                                        <button data-ng-click="editDisplayName()" class="btn btn-info btn-xs" data-ng-if="displayName != 'guest'"><i class="glyphicon glyphicon-edit"></i> Edit</button>
                                     </span>
                                 </p>
@@ -24 +24 @@
                                             <input name="editDisplayNameInput" class="form-control" type="text" required="required" data-ng-model="editDisplayNameText"/>
                                         </div>
-                                        <button data-ng-click="updateDisplayName(editDisplayNameText)" class="btn btn-success btn-xs" data-ng-disabled="editDisplayNameForm.$invalid || waitingForServerEditDisplayName"><i class="icon-check"></i> Save</button>
-                                        <button data-ng-click="terminateEditDisplayName()" class="btn btn-danger btn-xs"><i class="icon-remove"></i> Cancel</button>
+                                        <button data-ng-click="updateDisplayName(editDisplayNameText)" class="btn btn-success btn-xs" data-ng-disabled="editDisplayNameForm.$invalid || waitingForServerEditDisplayName"><i class="glyphicon glyphicon-check"></i> Save</button>
+                                        <button data-ng-click="terminateEditDisplayName()" class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-remove"></i> Cancel</button>
                                         <img src="images/spinner-small.gif" alt="Loading..." data-ng-if="waitingForServerEditDisplayName"/>
                                         <div class="col-md-12 has-error small" data-ng-if="editDisplayNameForm.editDisplayNameInput.$dirty &amp;&amp; editDisplayNameForm.editDisplayNameInput.$invalid">
@@ -48 +48 @@
                                         <span data-ng-bind="emailInstance"></span>
                                         <span>
-                                            <button data-ng-click="editEmail(emailInstance)" class="btn btn-info btn-xs"><i class="icon-edit"></i> Edit</button>
-                                            <button data-ng-click="removeEmail($index)" class="btn btn-danger btn-xs" data-ng-if="email.length &gt; 1"><i class="icon-remove"></i> Remove</button>
+                                            <button data-ng-click="editEmail(emailInstance)" class="btn btn-info btn-xs"><i class="glyphicon glyphicon-edit"></i> Edit</button>
+                                            <button data-ng-click="removeEmail($index)" class="btn btn-danger btn-xs" data-ng-if="email.length &gt; 1"><i class="glyphicon glyphicon-remove"></i> Remove</button>
                                             <img src="images/spinner-small.gif" alt="Loading..." data-ng-if="waitingForServerEditEmail"/>
                                         </span>
@@ -65 +65 @@
                                                 <input name="editEmailInput" class="form-control" type="email" required="required" data-ng-model="$parent.editEmailText"/>
                                             </div>
-                                            <button data-ng-click="updateEmail($index)" class="btn btn-success btn-xs" data-ng-disabled="editEmailForm.$invalid || waitingForServerEditEmail"><i class="icon-check"></i> Save</button>
-                                            <button data-ng-click="cancelEditEmail(emailInstance)" class="btn btn-danger btn-xs"><i class="icon-remove"></i> Cancel</button>
+                                            <button data-ng-click="updateEmail($index)" class="btn btn-success btn-xs" data-ng-disabled="editEmailForm.$invalid || waitingForServerEditEmail"><i class="glyphicon glyphicon-check"></i> Save</button>
+                                            <button data-ng-click="cancelEditEmail(emailInstance)" class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-remove"></i> Cancel</button>
                                             <img src="images/spinner-small.gif" alt="Loading..." data-ng-if="waitingForServerEditEmail"/>
                                             <span class="col-md-12 has-error small" data-ng-show="editEmailForm.editEmailInput.$dirty &amp;&amp; editEmailForm.editEmailInput.$invalid">
@@ -95 +95 @@
                                                 <input name="newEmailInput" class="form-control" type="email" required="required" data-ng-model="newEmailInputText"/>
                                             </div>
-                                            <button data-ng-click="addEmail(newEmailInputText)" class="btn btn-success btn-xs" data-ng-disabled="newEmailForm.$invalid || waitingForServer"><i class="icon-check"></i> Save</button>
-                                            <button data-ng-click="terminateAddEmail()" class="btn btn-danger btn-xs"><i class="icon-remove"></i> Cancel</button>
+                                            <button data-ng-click="addEmail(newEmailInputText)" class="btn btn-success btn-xs" data-ng-disabled="newEmailForm.$invalid || waitingForServer"><i class="glyphicon glyphicon-check"></i> Save</button>
+                                            <button data-ng-click="terminateAddEmail()" class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-remove"></i> Cancel</button>
                                             <img src="images/spinner-small.gif" alt="Loading..." data-ng-if="waitingForServer"/>
                                             <span class="col-md-12 has-error small" data-ng-if="newEmailForm.newEmailInput.$dirty &amp;&amp; newEmailForm.newEmailInput.$invalid">

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/partials/workspace.html

@@ -41 +41 @@
                     <p data-ng-if="selectedSchema['sc:schema']['sc:description'] == '[object Object]'">--</p>
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-sm-2">
                             <h4>Version:</h4>
                             <p data-ng-if="selectedSchema['sc:schema']['sc:version'] != '[object Object]'" data-ng-bind="selectedSchema['sc:schema']['sc:version']"/>
                             <p data-ng-if="selectedSchema['sc:schema']['sc:version'] == '[object Object]'">--</p>
                         </div>
-                        <div class="col-md-2">
+                        <div class="col-sm-2">
                             <h4>Status:</h4>
                             <p data-ng-if="selectedSchema['sc:schema']['sc:status'] != '[object Object]'" data-ng-bind="selectedSchema['sc:schema']['sc:status']"/>
                             <p data-ng-if="selectedSchema['sc:schema']['sc:status'] == '[object Object]'">--</p>
                         </div>
-                        <div class="col-md-2">
+                        <div class="col-sm-3" data-ng-init="accessDetailsPanel.open = false;">
                             <h4>Access:</h4>
-                            <p data-ng-if="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] == 'r'">shared URL</p>
-                            <p data-ng-if="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] != 'r'">private</p>
+                            <div data-collapse="workspace.waitingForServerAccessStatusUpdate">
+                                <p data-ng-if="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] == 'r'">
+                                    <span>shared URL&nbsp;</span>
+                                    <small id="access-actions">
+                                        <span data-ng-show="!accessDetailsPanel.open" class="word-breaking-wraper">
+                                            <a data-tooltip="Show access policy details" data-tooltip-popup-delay="750"
+                                                data-tooltip-placement="top" data-ng-click="toggleAccessDetails()" class="cursor-pointer"><i class="glyphicon glyphicon-collapse-down"></i></a>
+                                        </span>
+                                        <span data-ng-show="accessDetailsPanel.open" class="word-breaking-wraper">
+                                            <a data-tooltip="Hidde access policy details" data-tooltip-popup-delay="750"
+                                                data-tooltip-placement="bottom" data-ng-click="toggleAccessDetails()" class="cursor-pointer"><i class="glyphicon glyphicon-collapse-up"></i></a>
+                                        </span>
+                                    </small>
+                                </p>
+                                <p data-ng-if="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] != 'r'">
+                                    <span>private&nbsp;&nbsp;</span>
+                                    <small id="access-actions">
+                                        <span data-ng-show="!accessDetailsPanel.open" class="word-breaking-wraper">
+                                            <a data-tooltip="Show access policy details" data-tooltip-popup-delay="750"
+                                                data-tooltip-placement="top" data-ng-click="toggleAccessDetails()" class="cursor-pointer"><i class="glyphicon glyphicon-collapse-down"></i></a>
+                                        </span>
+                                        <span data-ng-show="accessDetailsPanel.open" class="word-breaking-wraper">
+                                            <a data-tooltip="Hidde access policy details" data-tooltip-popup-delay="750"
+                                                data-tooltip-placement="bottom" data-ng-click="toggleAccessDetails()" class="cursor-pointer"><i class="glyphicon glyphicon-collapse-up"></i></a>
+                                        </span>
+                                    </small>
+                                </p>
+                            </div>
                         </div>
-                        <div class="col-md-2">
+                        <div class="col-sm-2">
                             <h4>License:</h4>
                             <p data-ng-if="selectedSchema['sc:schema']['sc:license'] != undefined">
@@ -66 +92 @@
                         </div>
                     </div>
+                    <div class="row col-md-12" data-ng-controller="accessDetailsPanelCtrl">
+                        <div class="panel panel-primary small modal-title" data-collapse="!accessDetailsPanel.open">
+                            <div class="panel-heading">
+                                <label>Access policy:</label>
+                            </div>
+                            <div class="panel-body">
+                                <div data-collapse="!editAccessPanel.open">
+                                    <form name="workspace.editAccessForm" class="form-inline">
+                                        <div class="form-group small">
+                                            <label>Private</label>
+                                            <input type="radio" data-ng-change="saveAccessStatus(workspace.editAccessForm.accessPolicy)" name="accessRadios" id="accessRadios1" data-ng-model="workspace.editAccessForm.accessPolicy" value="private" ></input>
+                                            <span>&nbsp;</span>
+                                            <label>Shared URL</label>
+                                            <input type="radio" data-ng-change="saveAccessStatus(workspace.editAccessForm.accessPolicy)" name="accessRadios" id="accessRadios2" data-ng-model="workspace.editAccessForm.accessPolicy" value="shareURL"></input>
+                                            <span data-ng-show="workspace.waitingForServerAccessStatusUpdate">
+                                                &nbsp;&nbsp;<img src="images/spinner-small.gif" alt="Saving..."/>
+                                            </span>
+                                        </div>
+                                    </form>
+                                    <div class="form-group has-error">
+                                        <span class="help-block" data-collapse="!workspace.accessStatusUpdateAjaxError">
+                                            <div>The server responded with an error. Please try again!</div>
+                                            <div>If the problem persists contact us at:</div>
+                                            <div><a href="mailto:tla@mpi.nl">isocat@mpi.nl</a></div>
+                                        </span>
+                                    </div>
+                                </div>
+                                <p data-collapse="workspace.waitingForServerAccessStatusUpdate">
+                                    <label>
+                                        <span data-ng-hide="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] != 'r'">Shared URL&nbsp;&nbsp;</span>
+                                        <span data-ng-show="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] != 'r'">Private&nbsp;&nbsp;</span>
+                                        <a class="small cursor-pointer" data-ng-show="editAccessPanel.open" data-tooltip="Done" data-tooltip-popup-delay="750" data-ng-click="toggleEditAccess()">
+                                            <i class="glyphicon glyphicon-chevron-up"></i>
+                                        </a>
+                                        <a class="small cursor-pointer" data-ng-hide="editAccessPanel.open" data-tooltip="Change access policy" data-tooltip-popup-delay="750" data-ng-click="toggleEditAccess()">
+                                            <i class="glyphicon glyphicon-edit"></i>
+                                        </a>
+                                    </label>
+                                </p>
+                                <div data-collapse="workspace.waitingForServerAccessStatusUpdate">
+                                    <div data-ng-show="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] == 'r'">
+                                        <p>This schema is shared and its files can be accessed by anyone through the following public URL(s):</p>
+                                        <ul>
+                                            <li data-ng-repeat="file in filesList">{{location.protocol + '//' + location.host}}/schemacat/schemas/{{selectedSchema['sc:schema']['xml:id']}}/files/{{file['sc:name']}}</li>
+                                        </ul>
+                                    </div>
+                                    <div data-ng-hide="selectedSchema['sc:schema']['sc:access']['sc:all']['actions'] == 'r'">
+                                        <p>This schema is private to your workspace and cannot be accessed without authentication.</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <div class="row">
-                        <div class="col-md-2">
+                        <div class="col-sm-2">
                             <h5>Group tags:</h5>
                         </div>
-                        <h6 data-ng-if="selectedSchema['sc:schema']['sc:tag']['content']" data-ng-bind=" '[' + selectedSchema['sc:schema']['sc:tag']['content'] + ']'"></h6>
+                        <div class="col-sm-10">
+                            <h6 data-ng-if="selectedSchema['sc:schema']['sc:tag']['content']" data-ng-bind=" '[' + selectedSchema['sc:schema']['sc:tag']['content'] + ']'"></h6>
+                        </div>
                     </div>
                     <div>
@@ -78 +159 @@
                                 <span>
                                     <span data-ng-bind="file['sc:name']"></span><span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                                    <button type="button" class="btn btn-success btn-xs" data-ng-model="showSchemaBtn" data-btn-checkbox="" data-ng-click="showFile(file['sc:name']);">
-                                        <span data-ng-hide="showSchemaBtn">Show</span><span data-ng-show="showSchemaBtn">Hide</span>
-                                    </button>
-                                    <a href="/schemacat/schemas/{{selectedSchema['sc:schema']['xml:id']}}/files/{{file['sc:name']}}" class="btn btn-primary btn-xs">Open</a>
-                                    <a href="/schemacat/schemas/{{selectedSchema['sc:schema']['xml:id']}}/download/files/{{file['sc:name']}}" class="btn btn-danger btn-xs" download>Download</a>
+                                    <a class="btn btn-success btn-xs" data-ng-model="showSchemaBtn" data-btn-checkbox="" data-ng-click="showFile(file['sc:name'])">
+                                        <span data-tooltip="Show file inline" data-tooltip-popup-delay="750" data-tooltip-append-to-body="true" data-ng-hide="showSchemaBtn"><i class="glyphicon glyphicon glyphicon-collapse-down"></i> Show</span><span data-tooltip="Hide file" data-tooltip-popup-delay="750" data-tooltip-append-to-body="true" data-ng-show="showSchemaBtn"><i class="glyphicon glyphicon glyphicon-collapse-up"></i> Hide</span>
+                                    </a>
+                                    <a data-tooltip="Navigate to file URL" data-tooltip-popup-delay="750" data-tooltip-append-to-body="true" href="/schemacat/schemas/{{selectedSchema['sc:schema']['xml:id']}}/files/{{file['sc:name']}}" class="btn btn-primary btn-xs"><i class="glyphicon glyphicon-share"></i> Open</a>
+                                    <a data-tooltip="Download file" data-tooltip-popup-delay="750" data-tooltip-append-to-body="true" href="/schemacat/schemas/{{selectedSchema['sc:schema']['xml:id']}}/download/files/{{file['sc:name']}}" class="btn btn-danger btn-xs" download><i class="glyphicon glyphicon-download"></i> Download</a>
                                     <span data-ng-show="showSchemaBtn &amp;&amp; !file.open">
                                         <span>&nbsp;&nbsp;</span>
@@ -92 +173 @@
                                 </div>
                                 <div class="has-error small" data-ng-show="showFileAjaxError">
-                                    <small class="help-block">
+                                    <div class="help-block">
                                         <div>The server responded with an error. Please try again!</div>
                                         <div>If the problem persists contact us at:</div>

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/controllers.js

@@ -4 +4 @@
 SCHEMAcat.controller('WorkspaceCtrl', ['$scope', '$location', '$routeParams', '$timeout', 'SchemasList', 'Schema', 'UserService', 'Settings',
     function($scope, $location, $routeParams, $timeout, SchemasList, Schema, UserService, Settings) {
+
+
+        function prepareArrayForNgRepeat(data) {
+            var array;
+            if (data instanceof Array)
+                array = data;
+            else
+                array = new Array(data);
+            return array;
+        }
+
+
+        function loadSchemasList(page) {
+            //check if pageNumber is not a number (can happen e.g. due to manual input)
+            //reload on page 1 schema index 0 if so
+            if (isNaN(parseInt(page, 10)) || page < 1) {
+                $location.path('workspace/page/' + 1 + '/').search({
+                    'schemaIndex': 0
+                });
+                return;
+            }
+
+            //When the user changes page, the new AJAX data (next page) is requested by
+            //the unloading controller (previous page) and used by the next loaded
+            //controller (next page), thus we have to keep the server data across controller 
+            //reloads by saving it in the parent scope.
+            SchemasList.get({
+                    userID: UserService.id,
+                    startPage: page,
+                    pageSize: $scope.pageSize
+                },
+                function(result) {
+                    //we now have the pages range so we can configure the paginator and check if pageNumber is out of
+                    //range (can happen e.g. due to manual input) reload on page 1 schema index 0 if so
+                    if (page > Math.ceil(result['sc:result']['sc:total-schemas'] / $scope.pageSize)) {
+                        $location.path('workspace/page/' + 1 + '/').search({
+                            'schemaIndex': 0
+                        });
+                        return;
+                    }
+
+                    parentScope.totalSchemaItems = result['sc:result']['sc:total-schemas'];
+                    parentScope.currentPage = Number(page);
+
+
+                    //when there is just one element we create an array with it, so ng-repeat repeats just once
+                    parentScope.schemasList = prepareArrayForNgRepeat(result['sc:result']['sc:schemas']['sc:schema']);
+
+                    loadSchemaMetadata($location.search().schemaIndex);
+
+                    parentScope.schemasResult = result;
+                });
+        }
+
+
+        //loads (trough a 'Schema' AJAX call) the schema metadata of the schema placed
+        //in the 'index' position of the schemas list.
+        function loadSchemaMetadata(index) {
+            //if just changing the selected schema hide the metadata pane until the metadata is loaded
+            if ($scope.animateWorkspacePageChange !== 'invisible')
+                $scope.animateSchemaChange = 'invisible';
+            //check if schemaIndex is out of range (can happen e.g. due to manual input)
+            //reload on schema index 0 if so
+            if (isNaN(parseInt(index, 10)) || index < 0 || index > $scope.schemasList.length - 1) {
+                $scope.selectedSchemaIndex = undefined;
+                $location.search({
+                    'schemaIndex': 0
+                });
+                return;
+            }
+            //update the selected row to the route search part.
+            $scope.selectedSchemaIndex = index;
+
+            //make AJAX call to get the schema metadata for the selected row
+            var selectedSchemaRow = parentScope.schemasList[Number(index)];
+            Schema.get({
+                    schemaID: selectedSchemaRow['xml:id']
+                },
+                function(result) {
+                    //when there is just one element we create an array with it, so ng-repeat repeats just once
+                    parentScope.filesList = prepareArrayForNgRepeat(result['sc:schema']['sc:files']['sc:file']);
+
+                    if (Settings.getAnimationStatus()) {
+                        //fade in the schema metadata
+                        switch ($scope.toNextSchema) {
+                            case true:
+                                $scope.animateSchemaChange = 'animated fadeInUp';
+                                break;
+                            case false:
+                                $scope.animateSchemaChange = 'animated fadeInDown';
+                                break;
+                                //if it is a reload toNextPage will be undefined
+                            case undefined:
+                                $scope.animateSchemaChange = 'animated fadeInDown';
+                        }
+                    } else
+                        $scope.animateSchemaChange = '';
+
+                    parentScope.selectedSchema = result;
+                    updateAccessDetailsPanel();
+                    parentScope.resultHasArrived = true;
+                });
+
+        }
+
+
+        function updateAccessDetailsPanel() {
+            $scope.workspace.editAccessForm.accessPolicy = $scope.workspace.getAccessPolicy();
+            if ($location.search().showAccessDetails) {
+                $scope.accessDetailsPanel.open = true;
+            } else
+                $scope.accessDetailsPanel.open = false;
+        }
 
         //these models have to be stored in the parent scope since they are used across page changes and
@@ -16 +129 @@
         $scope.animateWorkspacePageChange = 'invisible';
 
+        $scope.workspace = {};
+        $scope.location = location;
+
+        window.clipboardData = 'test';
 
 
@@ -43 +160 @@
                     $scope.animateWorkspacePageChange = '';
                 //derregister the listener since the workspace page is now loaded
+                updateAccessDetailsPanel();
                 watchListener();
             }
@@ -68 +186 @@
             $location.search().schemaIndex = rowIndex.toString();
             delete $location.search().show;
+            $location.search($location.search());
+        };
+
+        $scope.toggleAccessDetails = function() {
+            $scope.accessDetailsPanel.open = !$scope.accessDetailsPanel.open;
+            if (!$scope.accessDetailsPanel.open)
+                delete $location.search().showAccessDetails;
+            else
+                $location.search().showAccessDetails = true;
+
             $location.search($location.search());
         };
@@ -135 +263 @@
         });
 
-
-        function loadSchemasList(page) {
-            //check if pageNumber is not a number (can happen e.g. due to manual input)
-            //reload on page 1 schema index 0 if so
-            if (isNaN(parseInt(page, 10))  || page < 1) {
-                $location.path('workspace/page/' + 1 + '/').search({
-                    'schemaIndex': 0
-                });
-                return;
-            }
-
-            //When the user changes page, the new AJAX data (next page) is requested by
-            //the unloading controller (previous page) and used by the next loaded
-            //controller (next page), thus we have to keep the server data across controller 
-            //reloads by saving it in the parent scope.
-            SchemasList.get({
-                    userID: UserService.id,
-                    startPage: page,
-                    pageSize: $scope.pageSize
+        parentScope.workspaceFirstLoaded = true;
+    }
+]);
+
+SCHEMAcat.controller('accessDetailsPanelCtrl', ['$scope', '$location', 'Schema',
+    function($scope, $location, Schema) {
+
+        var parentScope = $scope.$parent;
+        parentScope.editAccessPanel = {};
+
+        function updateEditAccessPanel() {
+            if ($location.search().edditingAccess) {
+                parentScope.editAccessPanel.open = true;
+            } else
+                parentScope.editAccessPanel.open = false;
+            $scope.workspace.accessStatusUpdateAjaxError = false;
+        }
+
+        $scope.toggleEditAccess = function() {
+            parentScope.editAccessPanel.open = !parentScope.editAccessPanel.open;
+            if (!parentScope.editAccessPanel.open)
+                delete $location.search().edditingAccess;
+            else
+                $location.search().edditingAccess = true;
+
+            $location.search($location.search());
+        };
+
+        $scope.workspace.getAccessPolicy = function() {
+            if (parentScope.selectedSchema['sc:schema']['sc:access']['sc:all'] !== undefined && parentScope.selectedSchema['sc:schema']['sc:access']['sc:all'].actions === 'r')
+                return 'shareURL';
+            else
+                return 'private';
+        };
+
+        $scope.saveAccessStatus = function(newAccessStatus) {
+            var accessUser = $scope.selectedSchema['sc:schema']['sc:access']['sc:user'];
+            var schema = new Schema();
+            $scope.workspace.waitingForServerAccessStatusUpdate = true;
+            $scope.workspace.accessStatusUpdateAjaxError = false;
+
+            switch (newAccessStatus) {
+                case 'shareURL':
+                    schema.access = {
+                        'all': {
+                            'actions': 'r'
+                        },
+                        'user': accessUser
+                    };
+                    break;
+                case 'private':
+                    schema.access = {
+                        'user': accessUser
+                    };
+                    break;
+            }
+
+            schema.$save({
+                    schemaID: $scope.schemasList[$scope.selectedSchemaIndex]['xml:id'],
+                    schemaField: 'access'
                 },
                 function(result) {
-                    //we now have the pages range so we can configure the paginator and check if pageNumber is out of
-                    //range (can happen e.g. due to manual input) reload on page 1 schema index 0 if so
-                    if (page > Math.ceil(result['sc:result']['sc:total-schemas'] / $scope.pageSize)) {
-                        $location.path('workspace/page/' + 1 + '/').search({
-                            'schemaIndex': 0
-                        });
-                        return;
-                    }
-
-                    parentScope.totalSchemaItems = result['sc:result']['sc:total-schemas'];
-                    parentScope.currentPage = Number(page);
-
-
-                    //when there is just one element we create an array with it, so ng-repeat repeats just once
-                    parentScope.schemasList = prepareArrayForNgRepeat(result['sc:result']['sc:schemas']['sc:schema']);
-
-                    loadSchemaMetadata($location.search().schemaIndex);
-
-                    parentScope.schemasResult = result;
-                });
-        }
-
-
-        //loads (trough a 'Schema' AJAX call) the schema metadata of the schema placed
-        //in the 'index' position of the schemas list.
-        function loadSchemaMetadata(index) {
-            //if just changing the selected schema hide the metadata pane until the metadata is loaded
-            if ($scope.animateWorkspacePageChange !== 'invisible')
-                $scope.animateSchemaChange = 'invisible';
-            //check if schemaIndex is out of range (can happen e.g. due to manual input)
-            //reload on schema index 0 if so
-            if (isNaN(parseInt(index, 10)) || index < 0 || index > $scope.schemasList.length - 1) {
-                $scope.selectedSchemaIndex = undefined;
-                $location.search({
-                    'schemaIndex': 0
-                });
-                return;
-            }
-            //update the selected row to the route search part.
-            $scope.selectedSchemaIndex = index;
-
-            //make AJAX call to get the schema metadata for the selected row
-            var selectedSchemaRow = parentScope.schemasList[Number(index)];
-            Schema.get({
-                    schemaID: selectedSchemaRow['xml:id']
-                },
-                function(result) {
-                    //when there is just one element we create an array with it, so ng-repeat repeats just once
-                    parentScope.filesList = prepareArrayForNgRepeat(result['sc:schema']['sc:files']['sc:file']);
-
-                    if (Settings.getAnimationStatus()) {
-                        //fade in the schema metadata
-                        switch ($scope.toNextSchema) {
-                            case true:
-                                $scope.animateSchemaChange = 'animated fadeInUp';
-                                break;
-                            case false:
-                                $scope.animateSchemaChange = 'animated fadeInDown';
-                                break;
-                                //if it is a reload toNextPage will be undefined
-                            case undefined:
-                                $scope.animateSchemaChange = 'animated fadeInDown';
-                        }
-                    } else
-                        $scope.animateSchemaChange = '';
-
-                    parentScope.selectedSchema = result;
-                    parentScope.resultHasArrived = true;
-                });
-
-        }
-
-        function prepareArrayForNgRepeat(data) {
-            var array;
-            if (data instanceof Array)
-                array = data;
-            else
-                array = new Array(data);
-            return array;
-        }
-
-        parentScope.workspaceFirstLoaded = true;
-
-    }
-]);
+                    if (result['sc:response'] !== undefined && result['sc:response'].success) {
+                        $scope.selectedSchema['sc:schema']['sc:access'] = result['sc:response']['sc:written-data']['sc:access'];
+                        $scope.workspace.waitingForServerAccessStatusUpdate = false;
+                    } else {
+                        //server reports an handeled error
+                        $scope.workspace.waitingForServerAccessStatusUpdate = false;
+                        $scope.workspace.accessStatusUpdateAjaxError = true;
+                    }
+                    //refresh the view model
+                    $scope.workspace.editAccessForm.accessPolicy = $scope.workspace.getAccessPolicy();
+                },
+                //no response, or response error flagged in http response headers
+                function() {
+                    $scope.workspace.waitingForServerAccessStatusUpdate = false;
+                    $scope.workspace.accessStatusUpdateAjaxError = true;
+                    $scope.workspace.editAccessForm.accessPolicy = $scope.workspace.getAccessPolicy();
+                });
+        };
+
+        $scope.$on('$routeUpdate', function(event, route) {
+            updateEditAccessPanel();
+        });
+
+        updateEditAccessPanel();
+    }
+]);
+
 
 

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/controllers.min.js

@@ -1 @@
-"use strict";SCHEMAcat.controller("WorkspaceCtrl",["$scope","$location","$routeParams","$timeout","SchemasList","Schema","UserService","Settings",function(a,b,c,d,e,f,g,h){function k(c){return isNaN(parseInt(c,10))||1>c?(b.path("workspace/page/1/").search({schemaIndex:0}),void 0):(e.get({userID:g.id,startPage:c,pageSize:a.pageSize},function(d){return c>Math.ceil(d["sc:result"]["sc:total-schemas"]/a.pageSize)?(b.path("workspace/page/1/").search({schemaIndex:0}),void 0):(i.totalSchemaItems=d["sc:result"]["sc:total-schemas"],i.currentPage=Number(c),i.schemasList=m(d["sc:result"]["sc:schemas"]["sc:schema"]),l(b.search().schemaIndex),i.schemasResult=d,void 0)}),void 0)}function l(c){if("invisible"!==a.animateWorkspacePageChange&&(a.animateSchemaChange="invisible"),isNaN(parseInt(c,10))||0>c||c>a.schemasList.length-1)return a.selectedSchemaIndex=void 0,b.search({schemaIndex:0}),void 0;a.selectedSchemaIndex=c;var d=i.schemasList[Number(c)];f.get({schemaID:d["xml:id"]},function(b){if(i.filesList=m(b["sc:schema"]["sc:files"]["sc:file"]),h.getAnimationStatus())switch(a.toNextSchema){case!0:a.animateSchemaChange="animated fadeInUp";break;case!1:a.animateSchemaChange="animated fadeInDown";break;case void 0:a.animateSchemaChange="animated fadeInDown"}else a.animateSchemaChange="";i.selectedSchema=b,i.resultHasArrived=!0})}function m(a){var b;return b=a instanceof Array?a:new Array(a)}var i=a.$parent;i.pageSize=10,a.selectedSchemaIndex=c.schemaIndex,a.animateWorkspacePageChange="invisible";var j=a.$watch("resultHasArrived",function(b){if(b){if(h.getAnimationStatus()){switch(i.toNextPage){case!1:a.animateWorkspacePageChange="animated slideInLeft";break;case!0:a.animateWorkspacePageChange="animated slideInRight";break;default:a.animateWorkspacePageChange="animated fadeInDown"}d(function(){a.animateWorkspacePageChange=""},250)}else a.animateWorkspacePageChange="";j()}});i.workspaceFirstLoaded||k(c.pageNumber),a.selectPage=function(a){b.search().schemaIndex="0",delete b.search().show,b.path("workspace.html/page/"+a+"/").search(b.search())},a.selectSchema=function(a){b.search().schemaIndex=a.toString(),delete b.search().show,b.search(b.search())},a.$on("$routeChangeStart",function(b,c,d){if(i.resultHasArrived=!1,h.getAnimationStatus())switch(i.toNextPage=void 0!==c.params&&void 0!==c.params.pageNumber&&c.params.pageNumber>d.params.pageNumber?!0:!1,c.templateUrl){case"partials/workspace.html":a.animateWorkspacePageChange=i.toNextPage?"animated slideOutLeft":"animated slideOutRight";break;case"partials/contact.html":case"partials/about.html":a.animateWorkspacePageChange="animated slideOutLeft";break;default:a.animateWorkspacePageChange="animated fadeOutDown"}"partials/workspace.html"===c.templateUrl?k(c.params.pageNumber):i.workspaceFirstLoaded=!1}),a.$on("$routeChangeSuccess",function(a,b,c){h.getAnimationStatus()&&(void 0===c||void 0===c.templateUrl||"partials/accountDetails.html"===c.templateUrl)&&(i.toNextPage=void 0)}),a.$on("$routeUpdate",function(b,c){"partials/workspace.html"===c.templateUrl&&c.params.schemaIndex!==a.selectedSchemaIndex&&(i.resultHasArrived=!1,h.getAnimationStatus()?(a.toNextSchema=c.params.schemaIndex>a.selectedSchemaIndex?!0:!1,a.animateSchemaChange=a.toNextSchema?"animated fadeOutUp":"animated fadeOutDown",d(function(){l(c.params.schemaIndex)},250)):l(c.params.schemaIndex))}),i.workspaceFirstLoaded=!0}]),SCHEMAcat.controller("FileController",["$scope","$http","$timeout","$location",function(a,b,c,d){function e(){void 0!==d.search().show&&-1!==d.search().show.indexOf(a.file["sc:name"])?(a.showSchemaBtn=!0,f(a.selectedSchema["sc:schema"]["xml:id"],a.file["sc:name"])):(a.showSchemaBtn=!1,a.file.open=!1)}function f(d,e){void 0===a.schemaFileContent?b.get("/schemacat/schemas/"+d+"/files/"+e).success(function(b){a.prettify="prettyprint linenums",c(function(){prettyPrint(),a.file.open=!0}),a.schemaFileContent=b}).error(function(){a.showSchemaBtn=!1,a.showFile(e),a.showFileAjaxError=!0}):a.file.open=!0}e(),a.showFile=function(b){a.showFileAjaxError=!1,c(function(){var c=d.search();if(a.showSchemaBtn===!0)void 0===c.show?c.show="#"+b:-1===c.show.indexOf(b)&&(c.show=c.show+"#"+b);else for(var e in c)if("show"===e){var f=c[e].split("#");for(var g in f)f[g]===b&&f.splice(g,1);var h=f.join("#");""!==h?c[e]=h:delete c[e]}d.search(c)})},a.$on("$routeUpdate",function(){a.resultHasArrived&&e()})}]),SCHEMAcat.controller("TopMenuCtrl",["$scope","$modal","$location","UserService","Settings","ShibService",function(a,b,c,d,e,f){function g(){a.topMenuCollapsed=!c.search().topMenuExpanded,e.setAnimationStatus(!c.search().animationsDisabled),a.animationsChecked=e.getAnimationStatus()}a.displayName=d.displayName,a.shibURL=f.url,a.$watch(function(){return d.displayName},function(b,c){b!==c&&(a.displayName=b)}),g(),a.isActive=function(a){return"/workspace.html"===a&&-1!==c.path().indexOf("/workspace.html/")?!0:a===c.path()},a.updateAnimationStatus=function(){a.animationsChecked=!a.animationsChecked,a.animationsChecked?delete c.search().animationsDisabled:c.search().animationsDisabled=!0,c.search(c.search())},a.toggleTopMenu=function(){a.topMenuCollapsed=!a.topMenuCollapsed,a.topMenuCollapsed?delete c.search().topMenuExpanded:c.search().topMenuExpanded=!0,c.search(c.search())},a.animationsUrlPart=function(){return c.search().animationsDisabled?"animationsDisabled":""},a.topMenuExpandedUrlPart=function(){return c.search().topMenuExpanded?"topMenuExpanded":""},a.$on("$routeUpdate",function(){g()}),a.loginClick=function(){var c=b.open({scope:a,templateUrl:"partials/loginModal.html",controller:"LoginModalCtrl"});c.result.then(function(a){alert("Now set the user cookie to ["+a+"]"),document.cookie="USER="+a+";domain=;path=/",document.location.hash="",document.location.reload(!0)})}}]),SCHEMAcat.controller("LoginModalCtrl",["$scope","$modalInstance",function(a,b){a.loginClose=function(){b.dismiss("cancel")},a.loginSubmit=function(){b.close(this.loginNameInput.text)}}]),SCHEMAcat.controller("AboutPageCtrl",["$scope","Settings",function(a,b){a.$parent.toNextPage=!1,b.getAnimationStatus()&&(a.animateInOut="animated slideInRight"),a.$on("$routeChangeStart",function(c,d){if(b.getAnimationStatus())switch(d.templateUrl){case"partials/workspace.html":a.animateInOut="animated slideOutRight";break;case"partials/contact.html":a.animateInOut="animated slideOutLeft";break;default:a.animateInOut="animated fadeOutDown"}}),a.$on("$routeChangeSuccess",function(c,d,e){if(b.getAnimationStatus()){var f=void 0!==e?e.templateUrl:void 0;switch(f){case"partials/workspace.html":a.animateInOut="animated slideInRight";break;case"partials/contact.html":a.animateInOut="animated slideInLeft";break;default:a.animateInOut="animated fadeInDown"}}})}]),SCHEMAcat.controller("ContactPageCtrl",["$scope","Settings",function(a,b){a.$parent.toNextPage=!1,b.getAnimationStatus()&&(a.animateInOut="animated slideInRight"),a.$on("$routeChangeStart",function(c,d){if(b.getAnimationStatus())switch(d.templateUrl){case"partials/about.html":case"partials/contact.html":case"partials/workspace.html":a.animateInOut="animated slideOutRight";break;default:a.animateInOut="animated fadeOutDown"}}),a.$on("$routeChangeSuccess",function(c,d,e){if(b.getAnimationStatus()){var f=void 0!==e?e.templateUrl:void 0;switch(f){case"partials/about.html":case"partials/contact.html":case"partials/workspace.html":a.animateInOut="animated slideInRight";break;default:a.animateInOut="animated fadeInDown"}}})}]),SCHEMAcat.controller("AccountDetailsPageCtrl",["$scope","$location","User","UserService","Settings",function(a,b,c,d,e){function f(){var a=b.search();for(var c in a)if("edditingEmail"===c){for(var e=a[c].split("#"),f=0;f<e.length;f++){for(var g=!1,h=0;h<d.email.length;h++)e[f]===d.email[h]&&(g=!0);g||e.splice(f,1)}var i=e.join("#");""!==i?a[c]=i:delete a[c]}b.search(a)}function g(){a.waitingForServerEditDisplayName=!1,a.editDisplayNameAjaxError=!1,b.search().edditingDisplayName?(a.editDisplayNameText=a.displayName,a.edditingDisplayName=!0):a.edditingDisplayName=!1}function h(){a.waitingForServer=!1,a.addingEmail=b.search().addingEmail?!0:!1}a.principal=d.principal,a.displayName=d.displayName,a.email=d.email,a.addingEmail=!1,a.addNewEmail=function(){b.search().addingEmail=!0,b.search(b.search())},a.terminateAddEmail=function(){a.ajaxError=!1,delete b.search().addingEmail,b.search(b.search())},a.addEmail=function(b){a.waitingForServer=!0;var e=new c;e.emails=d.email.slice(0),e.emails.push(b),e.$save({userID:d.id},function(c){void 0!==c["sc:response"]&&c["sc:response"].success?(d.email.push(b),a.terminateAddEmail()):(a.waitingForServer=!1,a.ajaxError=!0)},function(){a.waitingForServer=!1,a.ajaxError=!0})},a.editDisplayName=function(){b.search().edditingDisplayName=!0,b.search(b.search())},a.terminateEditDisplayName=function(){delete b.search().edditingDisplayName,b.search(b.search())},a.updateDisplayName=function(b){a.waitingForServerEditDisplayName=!0;var e=new c;e.displayName=b,e.$save({userID:d.id},function(c){void 0!==c["sc:response"]&&c["sc:response"].success?(a.displayName=d.displayName=b,a.terminateEditDisplayName()):(a.waitingForServerEditDisplayName=!1,a.editDisplayNameAjaxError=!0)},function(){a.waitingForServerEditDisplayName=!1,a.editDisplayNameAjaxError=!0})},e.getAnimationStatus()&&(a.animateAccountDetails="animated fadeInDown"),a.$on("$routeChangeStart",function(){e.getAnimationStatus()&&(a.animateAccountDetails="animated fadeOutUp")}),a.$on("$routeChangeSuccess",function(){e.getAnimationStatus()&&(a.animateAccountDetails="animated fadeInDown"),h(),g(),f()}),a.$on("$routeUpdate",function(){h(),g(),f()})}]),SCHEMAcat.controller("EmailInstanceCtrl",["$scope","$location","User","UserService",function(a,b,c,d){function e(){a.waitingForServerEditEmail=!1,void 0!==b.search().edditingEmail&&-1!==b.search().edditingEmail.indexOf(a.emailInstance)?(a.editEmailText=a.emailInstance,a.edditingEmail=!0):a.edditingEmail=!1}e(),a.editEmail=function(c){var d=b.search();a.removeEmailAjaxError=!1,d.edditingEmail=void 0===d.edditingEmail?c:b.search().edditingEmail+"#"+c,b.search(d)},a.removeEmail=function(b){a.waitingForServerEditEmail=!0;var e=new c;e.emails=d.email.slice(0),e.emails.splice(b,1),e.$save({userID:d.id},function(c){void 0!==c["sc:response"]&&c["sc:response"].success?d.email.splice(b,1):(a.waitingForServerEditEmail=!1,a.removeEmailAjaxError=!0)},function(){a.waitingForServerEditEmail=!1,a.removeEmailAjaxError=!0})},a.updateEmail=function(b){a.waitingForServerEditEmail=!0;var e=new c;e.emails=d.email.slice(0),e.emails[b]=a.editEmailText,e.$save({userID:d.id},function(c){if(void 0!==c["sc:response"]&&c["sc:response"].success){var e=a.editEmailText;a.cancelEditEmail(d.email[b]),d.email[b]=e}else a.waitingForServerEditEmail=!1,a.editEmailAjaxError=!0},function(){a.waitingForServerEditEmail=!1,a.editEmailAjaxError=!0})},a.cancelEditEmail=function(c){var d=b.search();a.editEmailAjaxError=!1;for(var e in d)if("edditingEmail"===e){var f=d[e].split("#");for(var g in f)f[g]===c&&f.splice(g,1);var h=f.join("#");""!==h?d[e]=h:delete d[e]}b.search(d)},a.$on("$routeChangeSuccess",function(){e()}),a.$on("$routeUpdate",function(){e()})}]),SCHEMAcat.controller("CompleteUserDetailsCtrl",["$scope","$modal",function(a,b){a.ajaxError=!1,a.waitingForServer=!1,b.open({scope:a,backdrop:"static",templateUrl:"partials/fillDetailsModal.html",controller:"CompleteUserDetailsModalCtrl"})}]),SCHEMAcat.controller("CompleteUserDetailsModalCtrl",["$scope","$modalInstance","User","UserService",function(a,b,c,d){a.userDetailsSubmit=function(){a.waitingForServer=!0,a.ajaxError=!1;var b=new c;b.emails=[],b.emails[0]=this.emailInput.text,b.displayName=this.displayNameInput.text,b.$save({userID:d.id},function(b){void 0!==b["sc:response"]&&b["sc:response"].success?document.location.pathname="schemacat/site/index.html":(a.waitingForServer=!1,a.ajaxError=!0)},function(){a.waitingForServer=!1,a.ajaxError=!0})}}]);
+"use strict";SCHEMAcat.controller("WorkspaceCtrl",["$scope","$location","$routeParams","$timeout","SchemasList","Schema","UserService","Settings",function(a,b,c,d,e,f,g,h){function i(a){var b;return b=a instanceof Array?a:new Array(a)}function j(c){return isNaN(parseInt(c,10))||1>c?(b.path("workspace/page/1/").search({schemaIndex:0}),void 0):(e.get({userID:g.id,startPage:c,pageSize:a.pageSize},function(d){return c>Math.ceil(d["sc:result"]["sc:total-schemas"]/a.pageSize)?(b.path("workspace/page/1/").search({schemaIndex:0}),void 0):(m.totalSchemaItems=d["sc:result"]["sc:total-schemas"],m.currentPage=Number(c),m.schemasList=i(d["sc:result"]["sc:schemas"]["sc:schema"]),k(b.search().schemaIndex),m.schemasResult=d,void 0)}),void 0)}function k(c){if("invisible"!==a.animateWorkspacePageChange&&(a.animateSchemaChange="invisible"),isNaN(parseInt(c,10))||0>c||c>a.schemasList.length-1)return a.selectedSchemaIndex=void 0,b.search({schemaIndex:0}),void 0;a.selectedSchemaIndex=c;var d=m.schemasList[Number(c)];f.get({schemaID:d["xml:id"]},function(b){if(m.filesList=i(b["sc:schema"]["sc:files"]["sc:file"]),h.getAnimationStatus())switch(a.toNextSchema){case!0:a.animateSchemaChange="animated fadeInUp";break;case!1:a.animateSchemaChange="animated fadeInDown";break;case void 0:a.animateSchemaChange="animated fadeInDown"}else a.animateSchemaChange="";m.selectedSchema=b,l(),m.resultHasArrived=!0})}function l(){a.workspace.editAccessForm.accessPolicy=a.workspace.getAccessPolicy(),a.accessDetailsPanel.open=b.search().showAccessDetails?!0:!1}var m=a.$parent;m.pageSize=10,a.selectedSchemaIndex=c.schemaIndex,a.animateWorkspacePageChange="invisible",a.workspace={},a.location=location,window.clipboardData="test";var n=a.$watch("resultHasArrived",function(b){if(b){if(h.getAnimationStatus()){switch(m.toNextPage){case!1:a.animateWorkspacePageChange="animated slideInLeft";break;case!0:a.animateWorkspacePageChange="animated slideInRight";break;default:a.animateWorkspacePageChange="animated fadeInDown"}d(function(){a.animateWorkspacePageChange=""},250)}else a.animateWorkspacePageChange="";l(),n()}});m.workspaceFirstLoaded||j(c.pageNumber),a.selectPage=function(a){b.search().schemaIndex="0",delete b.search().show,b.path("workspace.html/page/"+a+"/").search(b.search())},a.selectSchema=function(a){b.search().schemaIndex=a.toString(),delete b.search().show,b.search(b.search())},a.toggleAccessDetails=function(){a.accessDetailsPanel.open=!a.accessDetailsPanel.open,a.accessDetailsPanel.open?b.search().showAccessDetails=!0:delete b.search().showAccessDetails,b.search(b.search())},a.$on("$routeChangeStart",function(b,c,d){if(m.resultHasArrived=!1,h.getAnimationStatus())switch(m.toNextPage=void 0!==c.params&&void 0!==c.params.pageNumber&&c.params.pageNumber>d.params.pageNumber?!0:!1,c.templateUrl){case"partials/workspace.html":a.animateWorkspacePageChange=m.toNextPage?"animated slideOutLeft":"animated slideOutRight";break;case"partials/contact.html":case"partials/about.html":a.animateWorkspacePageChange="animated slideOutLeft";break;default:a.animateWorkspacePageChange="animated fadeOutDown"}"partials/workspace.html"===c.templateUrl?j(c.params.pageNumber):m.workspaceFirstLoaded=!1}),a.$on("$routeChangeSuccess",function(a,b,c){h.getAnimationStatus()&&(void 0===c||void 0===c.templateUrl||"partials/accountDetails.html"===c.templateUrl)&&(m.toNextPage=void 0)}),a.$on("$routeUpdate",function(b,c){"partials/workspace.html"===c.templateUrl&&c.params.schemaIndex!==a.selectedSchemaIndex&&(m.resultHasArrived=!1,h.getAnimationStatus()?(a.toNextSchema=c.params.schemaIndex>a.selectedSchemaIndex?!0:!1,a.animateSchemaChange=a.toNextSchema?"animated fadeOutUp":"animated fadeOutDown",d(function(){k(c.params.schemaIndex)},250)):k(c.params.schemaIndex))}),m.workspaceFirstLoaded=!0}]),SCHEMAcat.controller("accessDetailsPanelCtrl",["$scope","$location","Schema",function(a,b,c){function e(){d.editAccessPanel.open=b.search().edditingAccess?!0:!1,a.workspace.accessStatusUpdateAjaxError=!1}var d=a.$parent;d.editAccessPanel={},a.toggleEditAccess=function(){d.editAccessPanel.open=!d.editAccessPanel.open,d.editAccessPanel.open?b.search().edditingAccess=!0:delete b.search().edditingAccess,b.search(b.search())},a.workspace.getAccessPolicy=function(){return void 0!==d.selectedSchema["sc:schema"]["sc:access"]["sc:all"]&&"r"===d.selectedSchema["sc:schema"]["sc:access"]["sc:all"].actions?"shareURL":"private"},a.saveAccessStatus=function(b){var d=a.selectedSchema["sc:schema"]["sc:access"]["sc:user"],e=new c;switch(a.workspace.waitingForServerAccessStatusUpdate=!0,a.workspace.accessStatusUpdateAjaxError=!1,b){case"shareURL":e.access={all:{actions:"r"},user:d};break;case"private":e.access={user:d}}e.$save({schemaID:a.schemasList[a.selectedSchemaIndex]["xml:id"],schemaField:"access"},function(b){void 0!==b["sc:response"]&&b["sc:response"].success?(a.selectedSchema["sc:schema"]["sc:access"]=b["sc:response"]["sc:written-data"]["sc:access"],a.workspace.waitingForServerAccessStatusUpdate=!1):(a.workspace.waitingForServerAccessStatusUpdate=!1,a.workspace.accessStatusUpdateAjaxError=!0),a.workspace.editAccessForm.accessPolicy=a.workspace.getAccessPolicy()},function(){a.workspace.waitingForServerAccessStatusUpdate=!1,a.workspace.accessStatusUpdateAjaxError=!0,a.workspace.editAccessForm.accessPolicy=a.workspace.getAccessPolicy()})},a.$on("$routeUpdate",function(){e()}),e()}]),SCHEMAcat.controller("FileController",["$scope","$http","$timeout","$location",function(a,b,c,d){function e(){void 0!==d.search().show&&-1!==d.search().show.indexOf(a.file["sc:name"])?(a.showSchemaBtn=!0,f(a.selectedSchema["sc:schema"]["xml:id"],a.file["sc:name"])):(a.showSchemaBtn=!1,a.file.open=!1)}function f(d,e){void 0===a.schemaFileContent?b.get("/schemacat/schemas/"+d+"/files/"+e).success(function(b){a.prettify="prettyprint linenums",c(function(){prettyPrint(),a.file.open=!0}),a.schemaFileContent=b}).error(function(){a.showSchemaBtn=!1,a.showFile(e),a.showFileAjaxError=!0}):a.file.open=!0}e(),a.showFile=function(b){a.showFileAjaxError=!1,c(function(){var c=d.search();if(a.showSchemaBtn===!0)void 0===c.show?c.show="#"+b:-1===c.show.indexOf(b)&&(c.show=c.show+"#"+b);else for(var e in c)if("show"===e){var f=c[e].split("#");for(var g in f)f[g]===b&&f.splice(g,1);var h=f.join("#");""!==h?c[e]=h:delete c[e]}d.search(c)})},a.$on("$routeUpdate",function(){a.resultHasArrived&&e()})}]),SCHEMAcat.controller("TopMenuCtrl",["$scope","$modal","$location","UserService","Settings","ShibService",function(a,b,c,d,e,f){function g(){a.topMenuCollapsed=!c.search().topMenuExpanded,e.setAnimationStatus(!c.search().animationsDisabled),a.animationsChecked=e.getAnimationStatus()}a.displayName=d.displayName,a.shibURL=f.url,a.$watch(function(){return d.displayName},function(b,c){b!==c&&(a.displayName=b)}),g(),a.isActive=function(a){return"/workspace.html"===a&&-1!==c.path().indexOf("/workspace.html/")?!0:a===c.path()},a.updateAnimationStatus=function(){a.animationsChecked=!a.animationsChecked,a.animationsChecked?delete c.search().animationsDisabled:c.search().animationsDisabled=!0,c.search(c.search())},a.toggleTopMenu=function(){a.topMenuCollapsed=!a.topMenuCollapsed,a.topMenuCollapsed?delete c.search().topMenuExpanded:c.search().topMenuExpanded=!0,c.search(c.search())},a.animationsUrlPart=function(){return c.search().animationsDisabled?"animationsDisabled":""},a.topMenuExpandedUrlPart=function(){return c.search().topMenuExpanded?"topMenuExpanded":""},a.$on("$routeUpdate",function(){g()}),a.loginClick=function(){var c=b.open({scope:a,templateUrl:"partials/loginModal.html",controller:"LoginModalCtrl"});c.result.then(function(a){alert("Now set the user cookie to ["+a+"]"),document.cookie="USER="+a+";domain=;path=/",document.location.hash="",document.location.reload(!0)})}}]),SCHEMAcat.controller("LoginModalCtrl",["$scope","$modalInstance",function(a,b){a.loginClose=function(){b.dismiss("cancel")},a.loginSubmit=function(){b.close(this.loginNameInput.text)}}]),SCHEMAcat.controller("AboutPageCtrl",["$scope","Settings",function(a,b){a.$parent.toNextPage=!1,b.getAnimationStatus()&&(a.animateInOut="animated slideInRight"),a.$on("$routeChangeStart",function(c,d){if(b.getAnimationStatus())switch(d.templateUrl){case"partials/workspace.html":a.animateInOut="animated slideOutRight";break;case"partials/contact.html":a.animateInOut="animated slideOutLeft";break;default:a.animateInOut="animated fadeOutDown"}}),a.$on("$routeChangeSuccess",function(c,d,e){if(b.getAnimationStatus()){var f=void 0!==e?e.templateUrl:void 0;switch(f){case"partials/workspace.html":a.animateInOut="animated slideInRight";break;case"partials/contact.html":a.animateInOut="animated slideInLeft";break;default:a.animateInOut="animated fadeInDown"}}})}]),SCHEMAcat.controller("ContactPageCtrl",["$scope","Settings",function(a,b){a.$parent.toNextPage=!1,b.getAnimationStatus()&&(a.animateInOut="animated slideInRight"),a.$on("$routeChangeStart",function(c,d){if(b.getAnimationStatus())switch(d.templateUrl){case"partials/about.html":case"partials/contact.html":case"partials/workspace.html":a.animateInOut="animated slideOutRight";break;default:a.animateInOut="animated fadeOutDown"}}),a.$on("$routeChangeSuccess",function(c,d,e){if(b.getAnimationStatus()){var f=void 0!==e?e.templateUrl:void 0;switch(f){case"partials/about.html":case"partials/contact.html":case"partials/workspace.html":a.animateInOut="animated slideInRight";break;default:a.animateInOut="animated fadeInDown"}}})}]),SCHEMAcat.controller("AccountDetailsPageCtrl",["$scope","$location","User","UserService","Settings",function(a,b,c,d,e){function f(){var a=b.search();for(var c in a)if("edditingEmail"===c){for(var e=a[c].split("#"),f=0;f<e.length;f++){for(var g=!1,h=0;h<d.email.length;h++)e[f]===d.email[h]&&(g=!0);g||e.splice(f,1)}var i=e.join("#");""!==i?a[c]=i:delete a[c]}b.search(a)}function g(){a.waitingForServerEditDisplayName=!1,a.editDisplayNameAjaxError=!1,b.search().edditingDisplayName?(a.editDisplayNameText=a.displayName,a.edditingDisplayName=!0):a.edditingDisplayName=!1}function h(){a.waitingForServer=!1,a.addingEmail=b.search().addingEmail?!0:!1}a.principal=d.principal,a.displayName=d.displayName,a.email=d.email,a.addingEmail=!1,a.addNewEmail=function(){b.search().addingEmail=!0,b.search(b.search())},a.terminateAddEmail=function(){a.ajaxError=!1,delete b.search().addingEmail,b.search(b.search())},a.addEmail=function(b){a.waitingForServer=!0;var e=new c;e.emails=d.email.slice(0),e.emails.push(b),e.$save({userID:d.id},function(c){void 0!==c["sc:response"]&&c["sc:response"].success?(d.email.push(b),a.terminateAddEmail()):(a.waitingForServer=!1,a.ajaxError=!0)},function(){a.waitingForServer=!1,a.ajaxError=!0})},a.editDisplayName=function(){b.search().edditingDisplayName=!0,b.search(b.search())},a.terminateEditDisplayName=function(){delete b.search().edditingDisplayName,b.search(b.search())},a.updateDisplayName=function(b){a.waitingForServerEditDisplayName=!0;var e=new c;e.displayName=b,e.$save({userID:d.id},function(c){void 0!==c["sc:response"]&&c["sc:response"].success?(a.displayName=d.displayName=b,a.terminateEditDisplayName()):(a.waitingForServerEditDisplayName=!1,a.editDisplayNameAjaxError=!0)},function(){a.waitingForServerEditDisplayName=!1,a.editDisplayNameAjaxError=!0})},e.getAnimationStatus()&&(a.animateAccountDetails="animated fadeInDown"),a.$on("$routeChangeStart",function(){e.getAnimationStatus()&&(a.animateAccountDetails="animated fadeOutUp")}),a.$on("$routeChangeSuccess",function(){e.getAnimationStatus()&&(a.animateAccountDetails="animated fadeInDown"),h(),g(),f()}),a.$on("$routeUpdate",function(){h(),g(),f()})}]),SCHEMAcat.controller("EmailInstanceCtrl",["$scope","$location","User","UserService",function(a,b,c,d){function e(){a.waitingForServerEditEmail=!1,void 0!==b.search().edditingEmail&&-1!==b.search().edditingEmail.indexOf(a.emailInstance)?(a.editEmailText=a.emailInstance,a.edditingEmail=!0):a.edditingEmail=!1}e(),a.editEmail=function(c){var d=b.search();a.removeEmailAjaxError=!1,d.edditingEmail=void 0===d.edditingEmail?c:b.search().edditingEmail+"#"+c,b.search(d)},a.removeEmail=function(b){a.waitingForServerEditEmail=!0;var e=new c;e.emails=d.email.slice(0),e.emails.splice(b,1),e.$save({userID:d.id},function(c){void 0!==c["sc:response"]&&c["sc:response"].success?d.email.splice(b,1):(a.waitingForServerEditEmail=!1,a.removeEmailAjaxError=!0)},function(){a.waitingForServerEditEmail=!1,a.removeEmailAjaxError=!0})},a.updateEmail=function(b){a.waitingForServerEditEmail=!0;var e=new c;e.emails=d.email.slice(0),e.emails[b]=a.editEmailText,e.$save({userID:d.id},function(c){if(void 0!==c["sc:response"]&&c["sc:response"].success){var e=a.editEmailText;a.cancelEditEmail(d.email[b]),d.email[b]=e}else a.waitingForServerEditEmail=!1,a.editEmailAjaxError=!0},function(){a.waitingForServerEditEmail=!1,a.editEmailAjaxError=!0})},a.cancelEditEmail=function(c){var d=b.search();a.editEmailAjaxError=!1;for(var e in d)if("edditingEmail"===e){var f=d[e].split("#");for(var g in f)f[g]===c&&f.splice(g,1);var h=f.join("#");""!==h?d[e]=h:delete d[e]}b.search(d)},a.$on("$routeChangeSuccess",function(){e()}),a.$on("$routeUpdate",function(){e()})}]),SCHEMAcat.controller("CompleteUserDetailsCtrl",["$scope","$modal",function(a,b){a.ajaxError=!1,a.waitingForServer=!1,b.open({scope:a,backdrop:"static",templateUrl:"partials/fillDetailsModal.html",controller:"CompleteUserDetailsModalCtrl"})}]),SCHEMAcat.controller("CompleteUserDetailsModalCtrl",["$scope","$modalInstance","User","UserService",function(a,b,c,d){a.userDetailsSubmit=function(){a.waitingForServer=!0,a.ajaxError=!1;var b=new c;b.emails=[],b.emails[0]=this.emailInput.text,b.displayName=this.displayNameInput.text,b.$save({userID:d.id},function(b){void 0!==b["sc:response"]&&b["sc:response"].success?document.location.pathname="schemacat/site/index.html":(a.waitingForServer=!1,a.ajaxError=!0)},function(){a.waitingForServer=!1,a.ajaxError=!0})}}]);

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/services.js

@@ -12 +12 @@
 SCHEMAcat.factory('Schema', ['$resource',
     function($resource) {
-        var schema = $resource('/schemacat/schemas/:schemaID', {
-            schemaID: ''
+        var schema = $resource('/schemacat/schemas/:schemaID/:schemaField', {
+            schemaID: '',
+            schemaField: ''
         });
         return schema;

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/services.min.js

@@ -1 @@
-"use strict";SCHEMAcat.factory("SchemasList",["$resource",function(a){var b=a("/schemacat/users/:userID/schemas/pagedlist/page/:startPage/pagesize/:pageSize",{userID:"guest"});return b}]),SCHEMAcat.factory("Schema",["$resource",function(a){var b=a("/schemacat/schemas/:schemaID",{schemaID:""});return b}]),SCHEMAcat.factory("User",["$resource",function(a){var b=a("/schemacat/users/:userID",{userID:""});return b}]),SCHEMAcat.factory("Settings",["$resource",function(){function c(b){a=b}function d(){return a}function e(){return b}var a=!0,b={};return{getAnimationStatus:d,setAnimationStatus:c,getStore:e}}]);
+"use strict";SCHEMAcat.factory("SchemasList",["$resource",function(a){var b=a("/schemacat/users/:userID/schemas/pagedlist/page/:startPage/pagesize/:pageSize",{userID:"guest"});return b}]),SCHEMAcat.factory("Schema",["$resource",function(a){var b=a("/schemacat/schemas/:schemaID/:schemaField",{schemaID:"",schemaField:""});return b}]),SCHEMAcat.factory("User",["$resource",function(a){var b=a("/schemacat/users/:userID",{userID:""});return b}]),SCHEMAcat.factory("Settings",["$resource",function(){function c(b){a=b}function d(){return a}function e(){return b}var a=!0,b={};return{getAnimationStatus:d,setAnimationStatus:c,getStore:e}}]);

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/styles/SCHEMAcat.css

@@ -61 +61 @@
   height: auto;
   max-width: 100%;
+}
+
+.word-breaking-wraper{
+    word-wrap: break-word;
+}
+
+#access-actions .tooltip-inner {
+    max-width: 350px;
 }
 

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/styles/SCHEMAcat.min.css

@@ -1 @@
-body,html{height:100%}body{overflow-y:scroll}.centered{text-align:center}#about,#accountDetails,#contact,#schema-div,#workspace{-webkit-animation-duration:.25s;-moz-animation-duration:.25s;-o-animation-duration:.25s;animation-duration:.25s}#schema-background{min-height:350px}input.ng-dirty.ng-invalid{color:#b94a48;border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.cursor-pointer{cursor:pointer}.cursor-default{cursor:default}.sidebar-nav-fixed{position:fixed;width:21.97%;min-width:246px}.paginator{white-space:nowrap;min-width:241px}.img-responsive-inline{display:inline-block;height:auto;max-width:100%}pre{overflow-x:auto;overflow-wrap:normal;word-wrap:normal}pre code{background-color:inherit;white-space:pre;float:left;min-width:100%}#wrap{min-height:100%;height:auto!important;height:100%;margin:0 auto -71px}#footer,#pushf,#pushh{height:71px}#footer{background-color:#f5f5f5;padding-top:20px}.schemacat-fluid-container{padding-left:15px;padding-right:15px;margin-left:auto;margin-right:auto}.schemacat-fluid-container .jumbotron{border-radius:6px}.modal{overflow-y:auto}body.modal-open{overflow:scroll}@media (max-width:767px){#footer{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px}.navbar-fixed-top{position:relative;top:auto}#pushh{height:0}}@media (max-width:1009px){.sidebar-nav-fixed{position:static;width:auto}}
+body,html{height:100%}body{overflow-y:scroll}.centered{text-align:center}#about,#accountDetails,#contact,#schema-div,#workspace{-webkit-animation-duration:.25s;-moz-animation-duration:.25s;-o-animation-duration:.25s;animation-duration:.25s}#schema-background{min-height:350px}input.ng-dirty.ng-invalid{color:#b94a48;border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.cursor-pointer{cursor:pointer}.cursor-default{cursor:default}.sidebar-nav-fixed{position:fixed;width:21.97%;min-width:246px}.paginator{white-space:nowrap;min-width:241px}.img-responsive-inline{display:inline-block;height:auto;max-width:100%}.word-breaking-wraper{word-wrap:break-word}#access-actions .tooltip-inner{max-width:350px}pre{overflow-x:auto;overflow-wrap:normal;word-wrap:normal}pre code{background-color:inherit;white-space:pre;float:left;min-width:100%}#wrap{min-height:100%;height:auto!important;height:100%;margin:0 auto -71px}#footer,#pushf,#pushh{height:71px}#footer{background-color:#f5f5f5;padding-top:20px}.schemacat-fluid-container{padding-left:15px;padding-right:15px;margin-left:auto;margin-right:auto}.schemacat-fluid-container .jumbotron{border-radius:6px}.modal{overflow-y:auto}body.modal-open{overflow:scroll}@media (max-width:767px){#footer{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px}.navbar-fixed-top{position:relative;top:auto}#pushh{height:0}}@media (max-width:1009px){.sidebar-nav-fixed{position:static;width:auto}}