Changeset 495 for Dev/trunk/src/client/qed-client/pages

Timestamp:

03/10/14 00:47:38 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored TabbedBrowser? out of TabbedQuestionBrowser?.
• Remove questions from overview when deleted.
• Only return topics that are inhabited in a category when one is specified.

Location:

Dev/trunk/src/client/qed-client/pages

Files:

• questions.js (modified) (2 diffs)
• survey.js (modified) (1 diff)

Dev/trunk/src/client/qed-client/pages/questions.js

@@ -19 +19 @@
                 'class': 'orange',
                 dndType: null,
-                itemActions: {
-                    Delete: {
-                        callback: lang.hitch(this,"onDeleteQuestion"),
-                        icon: 'Delete',
-                        description: 'Delete question'
-                    },
-                    Edit: {
-                        callback: lang.hitch(this,"onEditQuestion"),
-                        icon: 'Edit',
-                        description: 'Edit question'
-                    },
-                    Publish: {
-                        callback: lang.hitch(this,"onPublishQuestion"),
-                        icon: 'Publish',
-                        description: 'Publish question'
+                getItemActions: lang.hitch(this,function(item) {
+                    var actions = {
+                        Edit: {
+                            callback: lang.hitch(this,"onEditQuestion"),
+                            icon: 'Edit',
+                            description: 'Edit question'
+                        }
+                    };
+                    if ( !item.publicationDate ) {
+                        lang.mixin(actions,{
+                            Delete: {
+                                callback: lang.hitch(this,"onDeleteQuestion"),
+                                icon: 'Delete',
+                                description: 'Delete question'
+                            },
+                            Publish: {
+                                callback: lang.hitch(this,"onPublishQuestion"),
+                                icon: 'Publish',
+                                description: 'Publish question'
+                            }
+                        });
                     }
-                }
+                    return actions;
+                })
             },this.questionBrowser);
             this.questionBrowser.startup();
@@ -45 +52 @@
             questions.remove(question)
             .then(lang.hitch(this,function(){
+                this.questionBrowser.removeItem(question);
                 this.notify("Question deleted.");
             }),lang.hitch(this,function(err){

Dev/trunk/src/client/qed-client/pages/survey.js

@@ -31 +31 @@
                 'class': 'blue',
                 include: 'published',
-                selectedActions: {
-                    "Include": {
-                        callback: lang.hitch(this,this._includeQuestion),
-                        icon: "Accept",
-                        description: "Include in survey"
-                    }
-                },
-                itemActions: {
-                    "Info": {
-                        callback: function(item){
-                            if ( item.description ) { alert(item.description); }
-                        },
-                        icon: "Inspect",
-                        description: "Show item description"
-                    }
-                }
+                getSelectedItemActions: lang.hitch(this,function() {
+                    return {
+                        "Include": {
+                            callback: lang.hitch(this,this._includeQuestion),
+                            icon: "Accept",
+                            description: "Include in survey"
+                        }
+                    };
+                }),
+                getItemActions: lang.hitch(this,function(item) {
+                    return {
+                        "Info": {
+                            callback: lang.hitch(this,function(item){
+                                if ( item.description ) { alert(item.description); }
+                            }),
+                            icon: "Inspect",
+                            description: "Show item description"
+                        }
+                    };
+                })
             },this.questionBrowser);
             this.questionBrowser.startup();