Merge branch 'issue-174'

Conflicts:
	circle/dashboard/templates/dashboard/operate.html

dashboard: fix icon on operate template

circle/dashboard/templates/dashboard/operate.html

@@ -20,7 +20,7 @@ Do you want to do the following operation on {{obj}}:
     <a class="btn btn-default" href="{{object.get_absolute_url}}"
     <a class="btn btn-default" href="{{object.get_absolute_url}}"
         data-dismiss="modal">{% trans "Cancel" %}</a>
         data-dismiss="modal">{% trans "Cancel" %}</a>
       <button class="btn btn-danger" type="submit" id="op-form-send">
       <button class="btn btn-danger" type="submit" id="op-form-send">
-        {% if op.icon %}<i class="icon-{{op.icon}}"></i> {% endif %}{{ op|capfirst }}
+        {% if opview.icon %}<i class="icon-{{opview.icon}}"></i> {% endif %}{{ op|capfirst }}
       </button>
       </button>
   </div>
   </div>
 </form>
 </form>

circle/dashboard/views.py

@@ -537,6 +537,7 @@ class OperationView(DetailView):
     def get_context_data(self, **kwargs):
     def get_context_data(self, **kwargs):
         ctx = super(OperationView, self).get_context_data(**kwargs)
         ctx = super(OperationView, self).get_context_data(**kwargs)
         ctx['op'] = self.get_op()
         ctx['op'] = self.get_op()
+        ctx['opview'] = self
         ctx['url'] = self.request.path
         ctx['url'] = self.request.path
         return ctx
         return ctx